summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Sync with maintJunio C Hamano2017-07-103-21/+54
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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 branch 'jc/utf8-fprintf' into maintJunio C Hamano2017-07-101-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fsck-name-object' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maintJunio C Hamano2017-07-101-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-07-101-22/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maintJunio C Hamano2017-07-101-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/shared-index-permfix' into maintJunio C Hamano2017-07-104-11/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/doc-pretty-color-auto-prefix' into maintJunio C Hamano2017-07-101-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mb/reword-autocomplete-message' into maintJunio C Hamano2017-07-101-6/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/t7508-indent-fix' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t4005-modernize' into maintJunio C Hamano2017-07-101-52/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-104-7/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/pack-bitmap-unaligned' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano2017-07-104-12/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2017-07-102-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/alias-early-config' into maintJunio C Hamano2017-07-108-61/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pretty-add-again' into maintJunio C Hamano2017-07-103-45/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/doc-gitattributes-empty-index' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/mergetools-meld-output-opt-on-macos' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-highlight-module' into maintJunio C Hamano2017-07-105-19/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: fix typoRalf Thielow2017-07-101-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sixteenth batch for 2.14Junio C Hamano2017-07-101-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-walk-maint'Junio C Hamano2017-07-103-12/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: include all fields when freeing complete_reflogsjk/reflog-walk-maintJeff King2017-07-071-8/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: don't free reflogs added to cacheJeff King2017-07-072-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: duplicate strings in complete_reflogs listJeff King2017-07-072-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflog-walk: skip over double-null oid due to HEAD renameJeff King2017-07-052-0/+13
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/unicode-10.0'Junio C Hamano2017-07-101-13/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | unicode: update the width tables to Unicode 10bb/unicode-10.0Beat Bolli2017-07-071-13/+29
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/typofix-commit-c-comment'Junio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-commentKaartic Sivaraam2017-07-061-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch'Junio C Hamano2017-07-1016-29/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildmatch: remove unused wildopts parameterab/wildmatchÆvar Arnfjörð Bjarmason2017-06-2316-29/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc'Junio C Hamano2017-07-104-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1collisiondetection: automatically enable when submodule is populatedab/sha1dcJunio C Hamano2017-07-031-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1dc: optionally use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason2017-07-034-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/free-and-null'Junio C Hamano2017-07-101-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | coccinelle: polish FREE_AND_NULL rulesrs/free-and-nullRené Scharfe2017-06-291-9/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/unquote-path-in-git-pm'Junio C Hamano2017-07-103-43/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pmPhillip Wood2017-06-301-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::unquote_path(): throw an exception on bad pathPhillip Wood2017-06-301-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git::unquote_path(): handle '\a'Phillip Wood2017-06-301-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add -i: move unquote_path() to Git.pmPhillip Wood2017-06-302-43/+53
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2017-07-102-8/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removalKaartic Sivaraam2017-06-302-2/+24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-template: remove outdated notice about explicit pathsKaartic Sivaraam2017-06-301-6/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifteenth batch for 2.14Junio C Hamano2017-07-061-0/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/strbuf-addftime-tzname-boolify'Junio C Hamano2017-07-063-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \