summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | rebase: add regression tests for console outputPhillip Wood2017-06-191-3/+64
| * | | | | | | | | rebase -i: add test for reflog messagePhillip Wood2017-06-191-0/+7
| * | | | | | | | | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-192-7/+8
* | | | | | | | | | Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2017-07-102-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add--interactive: quote commentChar regexjk/add-p-commentchar-fixJeff King2017-06-212-1/+9
| * | | | | | | | | | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-211-0/+1
* | | | | | | | | | | Merge branch 'js/alias-early-config' into maintJunio C Hamano2017-07-108-61/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | alias: use the early config machinery to expand aliasesjs/alias-early-configJohannes Schindelin2017-06-153-59/+26
| * | | | | | | | | | | t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-151-0/+11
| * | | | | | | | | | | t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-151-1/+3
| * | | | | | | | | | | help: use early config when autocorrecting aliasesJohannes Schindelin2017-06-151-1/+1
| * | | | | | | | | | | config: report correct line number upon errorJohannes Schindelin2017-06-152-1/+8
| * | | | | | | | | | | discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin2017-06-151-0/+1
* | | | | | | | | | | | Merge branch 'rs/pretty-add-again' into maintJunio C Hamano2017-07-103-45/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-153-45/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' into maintJunio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maintJunio C Hamano2017-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macosDavid Aguilar2017-06-181-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/diff-highlight-module' into maintJunio C Hamano2017-07-105-19/+82
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-highlight: split code into modulejk/diff-highlight-moduleJeff King2017-06-155-19/+82
| |/ / / / / / / / / / /
* | | | | | | | | | | | l10n: de.po: fix typoRalf Thielow2017-07-101-1/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Git 2.13.2v2.13.2Junio C Hamano2017-06-242-1/+18
* | | | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: git-reset: fix a trivial typosn/reset-doc-typofixŠtěpán Němec2017-06-151-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formatsSZEDER Gábor2017-06-151-2/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-241-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
* | | | | | | | | | | | Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2017-06-242-48/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | revision.c: use skip_prefix() in handle_revision_pseudo_opt()sg/revision-parser-skip-prefixSZEDER Gábor2017-06-121-9/+9
| * | | | | | | | | | | | revision.c: use skip_prefix() in handle_revision_opt()SZEDER Gábor2017-06-121-25/+23
| * | | | | | | | | | | | revision.c: stricter parsing of '--early-output'SZEDER Gábor2017-06-121-10/+7
| * | | | | | | | | | | | revision.c: stricter parsing of '--no-{min,max}-parents'SZEDER Gábor2017-06-121-2/+2
| * | | | | | | | | | | | revision.h: turn rev_info.early_output back into an unsigned intSZEDER Gábor2017-06-121-2/+3
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-241-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failureKyle J. McKay2017-06-121-0/+42
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorbStefan Beller2017-06-041-4/+5
* | | | | | | | | | | | | Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-241-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff-tree: update stale in-code commentsjc/diff-tree-stale-commentJunio C Hamano2017-06-021-3/+5
* | | | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-242-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fixPatrick Steinhardt2017-06-132-0/+19
* | | | | | | | | | | | | | | Merge branch 'ls/github' into maintJunio C Hamano2017-06-242-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Configure Git contribution guidelines for github.comls/githubLars Schneider2017-06-132-0/+26
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-241-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safetyJeff King2017-06-071-1/+7
* | | | | | | | | | | | | | | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-2410-147/+301
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: use blob path for blob/file diffsJeff King2017-05-242-2/+8
| * | | | | | | | | | | | | | | | diff: use pending "path" if it is availableJeff King2017-05-242-3/+8