Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | utf8.c: fix strbuf_utf8_replace() consuming data beyond input stringnd/strbuf-utf8-replace | Nguyễn Thái Ngọc Duy | 2014-08-11 | 1 | -0/+7 |
* | commit --amend: test specifies authorship but forgets to check | Fabian Ruch | 2014-07-30 | 1 | -0/+1 |
* | t4013: test diff-tree's --stdin commit formatting | Jeff King | 2014-07-28 | 1 | -0/+10 |
* | Merge branch 'zk/log-graph-showsig' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+31 |
|\ | |||||
| * | log: fix indentation for --graph --show-signaturezk/log-graph-showsig | Zoltan Klinger | 2014-07-09 | 1 | -0/+31 |
* | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+11 |
|\ \ | |||||
| * | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-merges | Charles Bailey | 2014-07-01 | 1 | -0/+11 |
* | | | Merge branch 'jm/dedup-test-config' into maint | Junio C Hamano | 2014-07-22 | 1 | -5/+0 |
|\ \ \ | |||||
| * | | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-config | Jeremiah Mahler | 2014-06-05 | 1 | -5/+0 |
* | | | | Merge branch 'sk/test-cmp-bin' into maint | Junio C Hamano | 2014-07-22 | 5 | -22/+28 |
|\ \ \ \ | |||||
| * | | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-bin | Stepan Kasal | 2014-06-04 | 5 | -22/+28 |
* | | | | | Merge branch 'lt/request-pull' into maint | Junio C Hamano | 2014-07-22 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pull | Johannes Sixt | 2014-06-02 | 1 | -1/+1 |
* | | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maint | Junio C Hamano | 2014-07-22 | 2 | -2/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-vars | Junio C Hamano | 2014-05-23 | 2 | -2/+10 |
* | | | | | | | 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 t6006jk/pretty-G-format-fixes | Jeff King | 2014-06-25 | 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 rowbc/fix-rebase-merge-skip | 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-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 | 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 speciallypb/trim-trailing-spaces | Junio C Hamano | 2014-06-13 | 1 | -6/+8 |
| * | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 | 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 t5542na/no-http-test-in-the-middle | 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 configjl/status-added-submodule-is-never-ignored | 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 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 |