summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/commit-graph-fsck'Junio C Hamano2018-08-271-6/+11
|\
| * config: fix commit-graph related config docsDerrick Stolee2018-08-231-6/+11
* | Merge branch 'js/range-diff'Junio C Hamano2018-08-271-1/+1
|\ \
| * | range-diff: update stale summary of --no-dual-colorKyle Meyer2018-08-271-1/+1
* | | Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano2018-08-271-3/+3
|\ \ \
| * | | t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'SZEDER Gábor2018-08-231-3/+3
* | | | Merge branch 'jk/hashcmp-optim-for-2.19'Junio C Hamano2018-08-271-0/+10
|\ \ \ \
| * | | | hashcmp: assert constant hash sizeJeff King2018-08-231-0/+10
* | | | | Merge branch 'ab/test-must-be-empty-for-master'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \
| * | | | | t6018-rev-list-glob: fix 'empty stdin' testSZEDER Gábor2018-08-221-1/+1
* | | | | | Merge branch 'sg/t3420-autostash-fix'Junio C Hamano2018-08-271-4/+4
|\ \ \ \ \ \
| * | | | | | t3420-rebase-autostash: don't try to grep non-existing filesSZEDER Gábor2018-08-221-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sg/t3903-missing-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | t3903-stash: don't try to grep non-existing fileSZEDER Gábor2018-08-221-1/+1
| |/ / / / /
* | | | | | Merge branch 'sg/t7501-thinkofix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | t7501-commit: drop silly command substitutionSZEDER Gábor2018-08-221-1/+1
* | | | | | | Merge branch 'sg/t0020-conversion-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t0020-crlf: check the right fileSZEDER Gábor2018-08-221-1/+1
* | | | | | | | Merge branch 'sg/t4051-fix'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t4051-diff-function-context: read the right fileSZEDER Gábor2018-08-221-1/+1
* | | | | | | | | Merge branch 'js/larger-timestamps'Junio C Hamano2018-08-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: use timestamp_t for author_date_slabDerrick Stolee2018-08-211-1/+1
* | | | | | | | | | Merge branch 'jk/use-compat-util-in-test-tool'Junio C Hamano2018-08-271-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-tool.h: include git-compat-util.hJeff King2018-08-211-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-2777-344/+231
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-2146-226/+114
| * | | | | | | | | | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'SZEDER Gábor2018-08-2110-16/+16
| * | | | | | | | | | tests: use 'test_must_be_empty' instead of 'test ! -s'SZEDER Gábor2018-08-214-4/+4
| * | | | | | | | | | tests: use 'test_must_be_empty' instead of '! test -s'SZEDER Gábor2018-08-2125-99/+98
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/opt-updates'Junio C Hamano2018-08-275-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parseopt: group literal string alternatives in argument helpRené Scharfe2018-08-213-4/+4
| * | | | | | | | | | remote: improve argument help for add --mirrorRené Scharfe2018-08-211-1/+1
| * | | | | | | | | | checkout-index: improve argument help for --stageRené Scharfe2018-08-211-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-08-274-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | generate-cmdlist.sh: collect config from all config.txt filesNguyễn Thái Ngọc Duy2018-08-214-14/+14
* | | | | | | | | | | Merge branch 'ab/unconditional-free-and-null'Junio C Hamano2018-08-274-12/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)Ævar Arnfjörð Bjarmason2018-08-174-12/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ep/worktree-quiet-option'Junio C Hamano2018-08-273-3/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | worktree: add --quiet optionElia Pinto2018-08-183-3/+22
* | | | | | | | | | | | Merge branch 'sm/branch-sort-config'Junio C Hamano2018-08-274-3/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | branch: support configuring --sort via .gitconfigSamuel Maftoul2018-08-164-3/+64
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'nd/config-core-checkstat-doc'Junio C Hamano2018-08-271-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | config.txt: clarify core.checkStatJunio C Hamano2018-08-171-4/+14
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/pack-deltify-regression-fix'Junio C Hamano2018-08-225-15/+58
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | pack-objects: fix performance issues on packing large deltasNguyễn Thái Ngọc Duy2018-07-235-15/+58
* | | | | | | | | | | Git 2.19-rc0v2.19.0-rc0Junio C Hamano2018-08-202-1/+81
* | | | | | | | | | | Merge branch 'ab/checkout-default-remote'Junio C Hamano2018-08-201-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t2024: mark test using "checkout -p" with PERL prerequisiteÆvar Arnfjörð Bjarmason2018-08-181-2/+7
* | | | | | | | | | | | Merge branch 'hn/highlight-sideband-keywords'Junio C Hamano2018-08-205-9/+235
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sideband: do not read beyond the end of inputJunio C Hamano2018-08-182-2/+20