Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint | Junio C Hamano | 2014-06-25 | 3 | -10/+13 |
|\ | |||||
| * | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 3 | -10/+13 |
* | | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+15 |
|\ \ | |||||
| * | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fix | Matthieu Moy | 2014-05-20 | 1 | -0/+15 |
* | | | Merge branch 'jc/shortlog-ref-exclude' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-exclude | Junio C Hamano | 2014-06-04 | 1 | -0/+6 |
* | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+53 |
|\ \ \ \ | |||||
| * | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive | David Turner | 2014-05-08 | 1 | -1/+1 |
| * | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 1 | -0/+53 |
| * | | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 | 7 | -7/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cn/fetch-prune-overlapping-destination' into maint | Junio C Hamano | 2014-04-09 | 1 | -0/+20 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 | 1 | -0/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-04-09 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 2 | -9/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/lib-terminal-lazy' into maint | Junio C Hamano | 2014-04-03 | 1 | -18/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'us/printf-not-echo' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/wt-status' into maint | Junio C Hamano | 2014-04-03 | 2 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchanged | Jeff King | 2014-05-15 | 1 | -0/+11 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-empty | Jeff King | 2014-04-28 | 1 | -1/+10 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-test | brian m. carlson | 2014-05-08 | 1 | -0/+9 |
* | | | | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 | 1 | -8/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespace | Junio C Hamano | 2014-03-26 | 1 | -8/+4 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'as/pretty-truncate' into maint | Junio C Hamano | 2014-06-25 | 4 | -71/+276 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncate | Alexey Shumkin | 2014-05-21 | 2 | -7/+7 |
| * | | | | | | | | | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding set | Alexey Shumkin | 2014-05-21 | 2 | -2/+213 |
| * | | | | | | | | | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format` | Alexey Shumkin | 2014-05-21 | 1 | -39/+13 |
| * | | | | | | | | | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding value | Alexey Shumkin | 2014-05-21 | 4 | -27/+39 |
| * | | | | | | | | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2014-05-19 | 1 | -3/+11 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-words | Jeff King | 2014-06-04 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | t5537: re-drop http tests | Jeff King | 2014-05-30 | 1 | -28/+0 |
* | | | | | | | | | | | | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" | Junio C Hamano | 2014-05-20 | 1 | -8/+23 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part) | Junio C Hamano | 2014-05-19 | 1 | -23/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'" | Junio C Hamano | 2014-05-19 | 1 | -23/+8 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' | Junio C Hamano | 2014-05-19 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refname | Richard Hansen | 2014-05-19 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-05-19 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | request-pull: resurrect for-linus -> tags/for-linus DWIM | Junio C Hamano | 2014-05-16 | 1 | -1/+7 |
* | | | | | | | | | | | | | | | | | | Merge branch 'km/git-svn-workaround-older-getopt-long' | Junio C Hamano | 2014-05-02 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-long | Kyle J. McKay | 2014-04-23 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' | Junio C Hamano | 2014-05-02 | 1 | -22/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | git-prompt.sh: don't put unsanitized branch names in $PS1 | Richard Hansen | 2014-04-22 | 1 | -22/+22 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'fc/transport-helper-sync-error-fix' | Junio C Hamano | 2014-04-24 | 1 | -8/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fix | Felipe Contreras | 2014-04-21 | 1 | -7/+4 |
| * | | | | | | | | | | | | | | | | | transport-helper: fix sync issue on crashes | Felipe Contreras | 2014-04-14 | 1 | -1/+19 |
* | | | | | | | | | | | | | | | | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given | Johan Herland | 2014-04-19 | 18 | -126/+126 |