Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t4005: modernize style and drop hard coded sha1sb/t4005-modernize | Stefan Beller | 2017-06-10 | 1 | -52/+43 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 4 | -7/+86 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | apply: check git diffs for mutually exclusive header linesrs/apply-validate-input | René Scharfe | 2017-06-27 | 2 | -0/+33 | |
| * | | | | | | | | | | | apply: check git diffs for invalid file modes | René Scharfe | 2017-06-27 | 2 | -6/+27 | |
| * | | | | | | | | | | | apply: check git diffs for missing old filenames | René Scharfe | 2017-06-27 | 2 | -1/+26 | |
* | | | | | | | | | | | | Merge branch 'jc/pack-bitmap-unaligned' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | pack-bitmap: don't perform unaligned memory accessjc/pack-bitmap-unaligned | James Clarke | 2017-06-26 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 4 | -12/+148 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-tests | Junio C Hamano | 2017-06-23 | 1 | -2/+2 | |
| * | | | | | | | | | | | | rebase: add more regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -2/+69 | |
| * | | | | | | | | | | | | rebase: add regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -3/+64 | |
| * | | | | | | | | | | | | rebase -i: add test for reflog message | Phillip Wood | 2017-06-19 | 1 | -0/+7 | |
| * | | | | | | | | | | | | sequencer: print autostash messages to stderr | Johannes Schindelin | 2017-06-19 | 2 | -7/+8 | |
* | | | | | | | | | | | | | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | add--interactive: quote commentChar regexjk/add-p-commentchar-fix | Jeff King | 2017-06-21 | 2 | -1/+9 | |
| * | | | | | | | | | | | | | add--interactive: handle EOF in prompt_yesno | Jeff King | 2017-06-21 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 | 8 | -61/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | alias: use the early config machinery to expand aliasesjs/alias-early-config | Johannes Schindelin | 2017-06-15 | 3 | -59/+26 | |
| * | | | | | | | | | | | | | t7006: demonstrate a problem with aliases in subdirectories | Johannes Schindelin | 2017-06-15 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | t1308: relax the test verifying that empty alias values are disallowed | Johannes Schindelin | 2017-06-15 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | help: use early config when autocorrecting aliases | Johannes Schindelin | 2017-06-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 | 2 | -1/+8 | |
| * | | | | | | | | | | | | | discover_git_directory(): avoid setting invalid git_dir | Johannes Schindelin | 2017-06-15 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | Merge branch 'rs/pretty-add-again' into maint | Junio C Hamano | 2017-07-10 | 3 | -45/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-again | René Scharfe | 2017-06-15 | 3 | -45/+0 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |