aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cc/shared-index-permfix' into maintJunio C Hamano2017-07-10
|\
| * t1700: make sure split-index respects core.sharedrepositoryChristian Couder2017-06-25
| * t1301: move modebits() to test-lib-functions.shChristian Couder2017-06-25
| * read-cache: use shared perms when writing shared indexChristian Couder2017-06-25
* | Merge branch 'ah/doc-pretty-color-auto-prefix' into maintJunio C Hamano2017-07-10
|\ \
| * | doc: clarify syntax for %C(auto,...) in pretty formatsAndreas Heiduk2017-06-24
* | | Merge branch 'mb/reword-autocomplete-message' into maintJunio C Hamano2017-07-10
|\ \ \
| * | | auto-correct: tweak phrasingMarc Branchaud2017-06-21
* | | | Merge branch 'ks/t7508-indent-fix' into maintJunio C Hamano2017-07-10
|\ \ \ \
| * | | | t7508: fix a broken indentationKaartic Sivaraam2017-06-21
| |/ / /
* | | | Merge branch 'sb/t4005-modernize' into maintJunio C Hamano2017-07-10
|\ \ \ \
| * | | | t4005: modernize style and drop hard coded sha1Stefan Beller2017-06-10
| |/ / /
* | | | Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-10
|\ \ \ \
| * | | | apply: check git diffs for mutually exclusive header linesRené Scharfe2017-06-27
| * | | | apply: check git diffs for invalid file modesRené Scharfe2017-06-27
| * | | | apply: check git diffs for missing old filenamesRené Scharfe2017-06-27
* | | | | Merge branch 'jc/pack-bitmap-unaligned' into maintJunio C Hamano2017-07-10
|\ \ \ \ \
| * | | | | pack-bitmap: don't perform unaligned memory accessJames Clarke2017-06-26
| | |/ / / | |/| | |
* | | | | Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano2017-07-10
|\ \ \ \ \
| * | | | | t3420: fix under GETTEXT_POISON buildJunio C Hamano2017-06-23
| * | | | | rebase: add more regression tests for console outputPhillip Wood2017-06-19
| * | | | | rebase: add regression tests for console outputPhillip Wood2017-06-19
| * | | | | rebase -i: add test for reflog messagePhillip Wood2017-06-19
| * | | | | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-19
* | | | | | Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \
| * | | | | | add--interactive: quote commentChar regexJeff King2017-06-21
| * | | | | | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-21
* | | | | | | Merge branch 'js/alias-early-config' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \
| * | | | | | | alias: use the early config machinery to expand aliasesJohannes Schindelin2017-06-15
| * | | | | | | t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-15
| * | | | | | | t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-15
| * | | | | | | help: use early config when autocorrecting aliasesJohannes Schindelin2017-06-15
| * | | | | | | config: report correct line number upon errorJohannes Schindelin2017-06-15
| * | | | | | | discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin2017-06-15
* | | | | | | | Merge branch 'rs/pretty-add-again' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: recalculate duplicate short hashesRené Scharfe2017-06-15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsAndreas Heiduk2017-06-15
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS XDavid Aguilar2017-06-18
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/diff-highlight-module' into maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-highlight: split code into moduleJeff King2017-06-15
| |/ / / / / / /
* | | | | | | | l10n: de.po: fix typoRalf Thielow2017-07-10
* | | | | | | | Git 2.13.2Junio C Hamano2017-06-24
* | | | | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: git-reset: fix a trivial typoŠtěpán Němec2017-06-15
| |/ / / / / / /
* | | | | | | | Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedsSZEDER Gábor2017-06-15
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | t3200: add test for single parameter passed to -m optionSahil Dua2017-06-13