Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 |
|\ | |||
| * | move "%G" format test from t7510 to t6006 | Jeff King | 2014-06-25 |
| * | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 |
| * | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 |
| * | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 |
| * | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 |
| * | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 |
* | | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 |
|\ \ | |||
| * | | rebase--merge: fix --skip with two conflicts in a row | brian m. carlson | 2014-06-16 |
| * | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ | |||
| * \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'pb/trim-trailing-spaces' into maint | Junio C Hamano | 2014-07-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t0008: do not depend on 'echo' handling backslashes specially | Junio C Hamano | 2014-06-13 |
| * | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 |
* | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 |
| * | | | | | | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 |
* | | | | | | | | | | Merge branch 'maint-1.8.5' into maint | Junio C Hamano | 2014-07-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t7300: repair filesystem permissions with test_when_finished | Jeff King | 2014-07-02 |
* | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t5538: move http push tests out to t5542 | Nick Alcock | 2014-05-30 |
* | | | | | | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
| * | | | | | | | | | | | | status/commit: show staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
* | | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commit | Max Kirillov | 2014-05-15 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'rr/rebase-autostash-fix' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | rebase -i: test "Nothing to do" case with autostash | Matthieu Moy | 2014-05-20 |
* | | | | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passed | Junio C Hamano | 2014-06-04 |
* | | | | | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystems | David Turner | 2014-05-08 |
| * | | | | | | | | | | | | | | | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cn/fetch-prune-overlapping-destination' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/lib-terminal-lazy' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'us/printf-not-echo' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/wt-status' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat data | Jeff King | 2014-05-15 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: do not complain of empty messages from -C | Jeff King | 2014-04-28 |
| |/ / / / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |