Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 | 2 | -9/+68 |
|\ | |||||
| * | move "%G" format test from t7510 to t6006 | Jeff King | 2014-06-26 | 2 | -6/+6 |
| * | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 | 1 | -0/+6 |
| * | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 | 1 | -0/+40 |
| * | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 | 1 | -0/+13 |
| * | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 | 1 | -6/+6 |
| * | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 | 1 | -3/+3 |
* | | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 | 1 | -0/+15 |
|\ \ | |||||
| * | | rebase--merge: fix --skip with two conflicts in a row | brian m. carlson | 2014-06-16 | 1 | -0/+15 |
| * | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-29 | 1 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-29 | 2 | -0/+38 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 | 1 | -22/+22 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'pb/trim-trailing-spaces' into maint | Junio C Hamano | 2014-07-10 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0008: do not depend on 'echo' handling backslashes specially | Junio C Hamano | 2014-06-13 | 1 | -6/+8 |
| * | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-03 | 1 | -0/+23 |
* | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -1/+17 |
| * | | | | | | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7300: repair filesystem permissions with test_when_finished | Jeff King | 2014-07-02 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maint | Junio C Hamano | 2014-06-25 | 2 | -59/+100 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5538: move http push tests out to t5542 | Nick Alcock | 2014-05-30 | 2 | -59/+100 |
* | | | | | | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+72 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -1/+1 |
| * | | | | | | | | | | | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 | 1 | -2/+72 |
* | | | | | | | | | | | | | 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 commit | 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 autostash | 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 passed | 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 filesystems | 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 data | 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 -C | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |