summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-121-3/+4
|\
| * wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
* | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-129-15/+14
|\ \
| * | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-109-15/+14
| |/
* | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-123-7/+54
|\ \
| * | ref-filter.c: drop return from void functionkn/ref-filter-branch-listAlejandro R. Sedeño2017-07-101-1/+1
| * | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-092-2/+47
| * | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | Merge branch 'rs/urlmatch-cleanup'Junio C Hamano2017-07-121-5/+5
|\ \ \
| * | | urlmatch: use hex2chr() in append_normalized_escapes()rs/urlmatch-cleanupRené Scharfe2017-07-091-5/+5
| | |/ | |/|
* | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-121-2/+1
|\ \ \
| * | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1
* | | | Merge branch 'sb/submodule-doc'Junio C Hamano2017-07-124-36/+234
|\ \ \ \
| * | | | submodules: overhaul documentationsb/submodule-docStefan Beller2017-06-224-36/+234
* | | | | 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