summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-122-0/+25
* Prepare for 2.13.3Junio C Hamano2017-07-102-1/+54
* Merge branch 'sb/merge-recursive-code-cleanup' into maintJunio C Hamano2017-07-101-3/+3
|\
| * merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanupStefan Beller2017-06-301-3/+3
* | Merge branch 'jc/utf8-fprintf' into maintJunio C Hamano2017-07-101-3/+2
|\ \
| * | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintfJunio C Hamano2017-06-281-3/+2
* | | Merge branch 'js/fsck-name-object' into maintJunio C Hamano2017-07-101-1/+1
|\ \ \
| * | | t1450: use egrep for regexp "alternation"js/fsck-name-objectJunio C Hamano2017-06-281-1/+1
* | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maintJunio C Hamano2017-07-101-4/+10
|\ \ \ \
| * | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fixJohannes Schindelin2017-07-051-4/+10
* | | | | Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-07-101-22/+66
|\ \ \ \ \
| * | | | | sha1dc: update from upstreamab/sha1dc-maintÆvar Arnfjörð Bjarmason2017-07-031-22/+66
* | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maintJunio C Hamano2017-07-101-7/+19
|\ \ \ \ \ \
| * | | | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctorA. Wilcox2017-06-271-7/+19
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cc/shared-index-permfix' into maintJunio C Hamano2017-07-104-11/+50
|\ \ \ \ \ \
| * | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfixChristian Couder2017-06-251-0/+30
| * | | | | | t1301: move modebits() to test-lib-functions.shChristian Couder2017-06-252-11/+12
| * | | | | | read-cache: use shared perms when writing shared indexChristian Couder2017-06-251-0/+8
* | | | | | | Merge branch 'ah/doc-pretty-color-auto-prefix' into maintJunio C Hamano2017-07-101-5/+6
|\ \ \ \ \ \ \
| * | | | | | | doc: clarify syntax for %C(auto,...) in pretty formatsah/doc-pretty-color-auto-prefixAndreas Heiduk2017-06-241-5/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mb/reword-autocomplete-message' into maintJunio C Hamano2017-07-101-6/+12
|\ \ \ \ \ \ \
| * | | | | | | auto-correct: tweak phrasingmb/reword-autocomplete-messageMarc Branchaud2017-06-211-6/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ks/t7508-indent-fix' into maintJunio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t7508: fix a broken indentationks/t7508-indent-fixKaartic Sivaraam2017-06-211-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'sb/t4005-modernize' into maintJunio C Hamano2017-07-101-52/+43
|\ \ \ \ \ \ \
| * | | | | | | t4005: modernize style and drop hard coded sha1sb/t4005-modernizeStefan Beller2017-06-101-52/+43
| |/ / / / / /
* | | | | | | Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-104-7/+86
|\ \ \ \ \ \ \
| * | | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-272-0/+33
| * | | | | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-272-6/+27
| * | | | | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-272-1/+26
* | | | | | | | Merge branch 'jc/pack-bitmap-unaligned' into maintJunio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-bitmap: don't perform unaligned memory accessjc/pack-bitmap-unalignedJames Clarke2017-06-261-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano2017-07-104-12/+148
|\ \ \ \ \ \ \ \
| * | | | | | | | t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-testsJunio C Hamano2017-06-231-2/+2
| * | | | | | | | rebase: add more regression tests for console outputPhillip Wood2017-06-191-2/+69
| * | | | | | | | rebase: add regression tests for console outputPhillip Wood2017-06-191-3/+64
| * | | | | | | | rebase -i: add test for reflog messagePhillip Wood2017-06-191-0/+7
| * | | | | | | | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-192-7/+8
* | | | | | | | | Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2017-07-102-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add--interactive: quote commentChar regexjk/add-p-commentchar-fixJeff King2017-06-212-1/+9
| * | | | | | | | | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-211-0/+1
* | | | | | | | | | Merge branch 'js/alias-early-config' into maintJunio C Hamano2017-07-108-61/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | alias: use the early config machinery to expand aliasesjs/alias-early-configJohannes Schindelin2017-06-153-59/+26
| * | | | | | | | | | t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-151-0/+11
| * | | | | | | | | | t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-151-1/+3
| * | | | | | | | | | help: use early config when autocorrecting aliasesJohannes Schindelin2017-06-151-1/+1
| * | | | | | | | | | config: report correct line number upon errorJohannes Schindelin2017-06-152-1/+8
| * | | | | | | | | | discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin2017-06-151-0/+1
* | | | | | | | | | | Merge branch 'rs/pretty-add-again' into maintJunio C Hamano2017-07-103-45/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-153-45/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | |