Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | 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 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-index | Andreas Heiduk | 2017-06-15 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macos | David Aguilar | 2017-06-18 | 1 | -1/+1 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'jk/diff-highlight-module' into maint | Junio C Hamano | 2017-07-10 | 5 | -19/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | diff-highlight: split code into modulejk/diff-highlight-module | Jeff King | 2017-06-15 | 5 | -19/+82 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | l10n: de.po: fix typo | Ralf Thielow | 2017-07-10 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Git 2.13.2v2.13.2 | Junio C Hamano | 2017-06-24 | 2 | -1/+18 | |
* | | | | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | doc: git-reset: fix a trivial typosn/reset-doc-typofix | Štěpán Němec | 2017-06-15 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'sg/doc-pretty-formats' into maint | Junio C Hamano | 2017-06-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formats | SZEDER Gábor | 2017-06-15 | 1 | -2/+2 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-test | Sahil Dua | 2017-06-13 | 1 | -0/+17 | |
* | | | | | | | | | | | | Merge branch 'sg/revision-parser-skip-prefix' into maint | Junio C Hamano | 2017-06-24 | 2 | -48/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | revision.c: use skip_prefix() in handle_revision_pseudo_opt()sg/revision-parser-skip-prefix | SZEDER Gábor | 2017-06-12 | 1 | -9/+9 | |
| * | | | | | | | | | | | | revision.c: use skip_prefix() in handle_revision_opt() | SZEDER Gábor | 2017-06-12 | 1 | -25/+23 | |
| * | | | | | | | | | | | | revision.c: stricter parsing of '--early-output' | SZEDER Gábor | 2017-06-12 | 1 | -10/+7 | |
| * | | | | | | | | | | | | revision.c: stricter parsing of '--no-{min,max}-parents' | SZEDER Gábor | 2017-06-12 | 1 | -2/+2 | |
| * | | | | | | | | | | | | revision.h: turn rev_info.early_output back into an unsigned int | SZEDER Gábor | 2017-06-12 | 1 | -2/+3 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failure | Kyle J. McKay | 2017-06-12 | 1 | -0/+42 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'sb/submodule-rm-absorb' into maint | Junio C Hamano | 2017-06-24 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorb | Stefan Beller | 2017-06-04 | 1 | -4/+5 | |
* | | | | | | | | | | | | | Merge branch 'jc/diff-tree-stale-comment' into maint | Junio C Hamano | 2017-06-24 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | diff-tree: update stale in-code commentsjc/diff-tree-stale-comment | Junio C Hamano | 2017-06-02 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-24 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fix | Patrick Steinhardt | 2017-06-13 | 2 | -0/+19 | |
* | | | | | | | | | | | | | | | Merge branch 'ls/github' into maint | Junio C Hamano | 2017-06-24 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Configure Git contribution guidelines for github.comls/github | Lars Schneider | 2017-06-13 | 2 | -0/+26 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safety | Jeff King | 2017-06-07 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-24 | 10 | -147/+301 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | diff: use blob path for blob/file diffs | Jeff King | 2017-05-24 | 2 | -2/+8 | |
| * | | | | | | | | | | | | | | | | diff: use pending "path" if it is available | Jeff King | 2017-05-24 | 2 | -3/+8 | |
| * | | | | | | | | | | | | | | | | diff: use the word "path" instead of "name" for blobs | Jeff King | 2017-05-24 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | | | diff: pass whole pending entry in blobinfo | Jeff King | 2017-05-24 | 1 | -23/+15 |