summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff-options doc: grammar fixas/diff-options-grammofixAnthony Sottile2017-07-311-1/+1
* fixes from 'master' for 2.13.4Junio C Hamano2017-07-212-1/+11
* Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano2017-07-211-3/+3
|\
| * set FD_CLOEXEC properly when O_CLOEXEC is not supportedew/fd-cloexec-fixEric Wong2017-07-171-3/+3
* | Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano2017-07-211-1/+1
|\ \
| * | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano2017-07-212-1/+8
|\ \ \
| * | | alias: compare alias name *case-insensitively*js/alias-case-sensitivityJohannes Schindelin2017-07-172-2/+2
| * | | t1300: demonstrate that CamelCased aliases regressedJohannes Schindelin2017-07-171-0/+7
* | | | Merge branch 'bb/unicode-10.0' into maintJunio C Hamano2017-07-211-13/+29
|\ \ \ \
| * | | | unicode: update the width tables to Unicode 10bb/unicode-10.0Beat Bolli2017-07-071-13/+29
* | | | | Git 2.13.3v2.13.3Junio C Hamano2017-07-122-1/+10
* | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio 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 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
|\ \ \ \ \ \
| * | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-commentKaartic Sivaraam2017-07-061-1/+1
* | | | | | | Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-123-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
| |/ / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \