Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Prepare for 2.13.3 | Junio C Hamano | 2017-07-10 |
* | Merge branch 'sb/merge-recursive-code-cleanup' into maint | Junio C Hamano | 2017-07-10 |
|\ | |||
| * | merge-recursive: use DIFF_XDL_SET macro | Stefan Beller | 2017-06-30 |
* | | Merge branch 'jc/utf8-fprintf' into maint | Junio C Hamano | 2017-07-10 |
|\ \ | |||
| * | | submodule--helper: do not call utf8_fprintf() unnecessarily | Junio C Hamano | 2017-06-28 |
* | | | Merge branch 'js/fsck-name-object' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ | |||
| * | | | t1450: use egrep for regexp "alternation" | Junio C Hamano | 2017-06-28 |
* | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ | |||
| * | | | | t5534: fix misleading grep invocation | Johannes Schindelin | 2017-07-05 |
* | | | | | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ | |||
| * | | | | | sha1dc: update from upstream | Ævar Arnfjörð Bjarmason | 2017-07-03 |
* | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | subtree: honour USE_ASCIIDOCTOR when set | A. Wilcox | 2017-06-27 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'cc/shared-index-permfix' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | t1700: make sure split-index respects core.sharedrepository | Christian Couder | 2017-06-25 |
| * | | | | | | t1301: move modebits() to test-lib-functions.sh | Christian Couder | 2017-06-25 |
| * | | | | | | read-cache: use shared perms when writing shared index | Christian Couder | 2017-06-25 |
* | | | | | | | Merge branch 'ah/doc-pretty-color-auto-prefix' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | doc: clarify syntax for %C(auto,...) in pretty formats | Andreas Heiduk | 2017-06-24 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'mb/reword-autocomplete-message' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | auto-correct: tweak phrasing | Marc Branchaud | 2017-06-21 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'ks/t7508-indent-fix' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t7508: fix a broken indentation | Kaartic Sivaraam | 2017-06-21 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t4005: modernize style and drop hard coded sha1 | Stefan Beller | 2017-06-10 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | apply: check git diffs for mutually exclusive header lines | René Scharfe | 2017-06-27 |
| * | | | | | | | apply: check git diffs for invalid file modes | René Scharfe | 2017-06-27 |
| * | | | | | | | apply: check git diffs for missing old filenames | René Scharfe | 2017-06-27 |
* | | | | | | | | Merge branch 'jc/pack-bitmap-unaligned' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | pack-bitmap: don't perform unaligned memory access | James Clarke | 2017-06-26 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t3420: fix under GETTEXT_POISON build | Junio C Hamano | 2017-06-23 |
| * | | | | | | | | rebase: add more regression tests for console output | Phillip Wood | 2017-06-19 |
| * | | | | | | | | rebase: add regression tests for console output | Phillip Wood | 2017-06-19 |
| * | | | | | | | | rebase -i: add test for reflog message | Phillip Wood | 2017-06-19 |
| * | | | | | | | | sequencer: print autostash messages to stderr | Johannes Schindelin | 2017-06-19 |
* | | | | | | | | | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | add--interactive: quote commentChar regex | Jeff King | 2017-06-21 |
| * | | | | | | | | | add--interactive: handle EOF in prompt_yesno | Jeff King | 2017-06-21 |
* | | | | | | | | | | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | alias: use the early config machinery to expand aliases | Johannes Schindelin | 2017-06-15 |
| * | | | | | | | | | | t7006: demonstrate a problem with aliases in subdirectories | Johannes Schindelin | 2017-06-15 |
| * | | | | | | | | | | t1308: relax the test verifying that empty alias values are disallowed | Johannes Schindelin | 2017-06-15 |
| * | | | | | | | | | | help: use early config when autocorrecting aliases | Johannes Schindelin | 2017-06-15 |
| * | | | | | | | | | | config: report correct line number upon error | Johannes Schindelin | 2017-06-15 |
| * | | | | | | | | | | discover_git_directory(): avoid setting invalid git_dir | Johannes Schindelin | 2017-06-15 |
* | | | | | | | | | | | Merge branch 'rs/pretty-add-again' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | pretty: recalculate duplicate short hashes | René Scharfe | 2017-06-15 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' into maint | Junio C Hamano | 2017-07-10 |
|\ \ \ \ \ \ \ \ \ \ \ |