Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/apply-avoid-over-reading' into maint | Junio C Hamano | 2017-07-31 | 1 | -4/+2 |
|\ | |||||
| * | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-reading | René Scharfe | 2017-07-09 | 1 | -2/+1 |
| * | apply: use starts_with() in gitdiff_verify_name() | René Scharfe | 2017-07-01 | 1 | -2/+1 |
* | | fixes from 'master' for 2.13.4 | Junio C Hamano | 2017-07-21 | 2 | -1/+11 |
* | | Merge branch 'ew/fd-cloexec-fix' into maint | Junio C Hamano | 2017-07-21 | 1 | -3/+3 |
|\ \ | |||||
| * | | set FD_CLOEXEC properly when O_CLOEXEC is not supportedew/fd-cloexec-fix | Eric Wong | 2017-07-17 | 1 | -3/+3 |
* | | | Merge branch 'ks/fix-rebase-doc-picture' into maint | Junio C Hamano | 2017-07-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-picture | Kaartic Sivaraam | 2017-07-10 | 1 | -1/+1 |
* | | | | Merge branch 'js/alias-case-sensitivity' into maint | Junio C Hamano | 2017-07-21 | 2 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | alias: compare alias name *case-insensitively*js/alias-case-sensitivity | Johannes Schindelin | 2017-07-17 | 2 | -2/+2 |
| * | | | | t1300: demonstrate that CamelCased aliases regressed | Johannes Schindelin | 2017-07-17 | 1 | -0/+7 |
* | | | | | Merge branch 'bb/unicode-10.0' into maint | Junio C Hamano | 2017-07-21 | 1 | -13/+29 |
|\ \ \ \ \ | |||||
| * | | | | | unicode: update the width tables to Unicode 10bb/unicode-10.0 | Beat Bolli | 2017-07-07 | 1 | -13/+29 |
* | | | | | | Git 2.13.3v2.13.3 | Junio C Hamano | 2017-07-12 | 2 | -1/+10 |
* | | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-12 | 3 | -7/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-list | Alejandro R. Sedeño | 2017-07-10 | 1 | -1/+1 |
| * | | | | | | branch: set remote color in ref-filter branch immediately | Jeff King | 2017-07-09 | 1 | -5/+6 |
| * | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 2 | -2/+47 |
| * | | | | | | branch: only perform HEAD check for local branches | Jeff King | 2017-07-09 | 1 | -1/+2 |
* | | | | | | | Merge branch 'ks/typofix-commit-c-comment' into maint | Junio C Hamano | 2017-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/commit.c: fix a typo in the commentks/typofix-commit-c-comment | Kaartic Sivaraam | 2017-07-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-12 | 3 | -12/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | reflog-walk: include all fields when freeing complete_reflogsjk/reflog-walk-maint | Jeff King | 2017-07-07 | 1 | -8/+18 |
| * | | | | | | | | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 2 | -4/+4 |
| * | | | | | | | | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 2 | -0/+7 |
| * | | | | | | | | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 2 | -0/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Prepare for 2.13.3 | Junio C Hamano | 2017-07-10 | 2 | -1/+54 |
* | | | | | | | | Merge branch 'sb/merge-recursive-code-cleanup' into maint | Junio C Hamano | 2017-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge-recursive: use DIFF_XDL_SET macrosb/merge-recursive-code-cleanup | Stefan Beller | 2017-06-30 | 1 | -3/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/utf8-fprintf' into maint | Junio C Hamano | 2017-07-10 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule--helper: do not call utf8_fprintf() unnecessarilyjc/utf8-fprintf | Junio C Hamano | 2017-06-28 | 1 | -3/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/fsck-name-object' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t1450: use egrep for regexp "alternation"js/fsck-name-object | Junio C Hamano | 2017-06-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5534: fix misleading grep invocationjs/t5534-rev-parse-gives-multi-line-output-fix | Johannes Schindelin | 2017-07-05 | 1 | -4/+10 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-07-10 | 1 | -22/+66 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1dc: update from upstreamab/sha1dc-maint | Ævar Arnfjörð Bjarmason | 2017-07-03 | 1 | -22/+66 |
* | | | | | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint | Junio C Hamano | 2017-07-10 | 1 | -7/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctor | A. Wilcox | 2017-06-27 | 1 | -7/+19 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cc/shared-index-permfix' into maint | Junio C Hamano | 2017-07-10 | 4 | -11/+50 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t1700: make sure split-index respects core.sharedrepositorycc/shared-index-permfix | Christian Couder | 2017-06-25 | 1 | -0/+30 |
| * | | | | | | | | | | t1301: move modebits() to test-lib-functions.sh | Christian Couder | 2017-06-25 | 2 | -11/+12 |
| * | | | | | | | | | | read-cache: use shared perms when writing shared index | Christian Couder | 2017-06-25 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'ah/doc-pretty-color-auto-prefix' into maint | Junio C Hamano | 2017-07-10 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc: clarify syntax for %C(auto,...) in pretty formatsah/doc-pretty-color-auto-prefix | Andreas Heiduk | 2017-06-24 | 1 | -5/+6 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mb/reword-autocomplete-message' into maint | Junio C Hamano | 2017-07-10 | 1 | -6/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | auto-correct: tweak phrasingmb/reword-autocomplete-message | Marc Branchaud | 2017-06-21 | 1 | -6/+12 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ks/t7508-indent-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t7508: fix a broken indentationks/t7508-indent-fix | Kaartic Sivaraam | 2017-06-21 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 | 1 | -52/+43 |
|\ \ \ \ \ \ \ \ \ \ \ |