Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'sn/reset-doc-typofix' | 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' | 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 'rs/pretty-add-again' | Junio C Hamano | 2017-06-24 | 3 | -45/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-again | René Scharfe | 2017-06-15 | 3 | -45/+0 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-highlight-module' | Junio C Hamano | 2017-06-24 | 5 | -19/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: split code into modulejk/diff-highlight-module | Jeff King | 2017-06-15 | 5 | -19/+82 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index' | Junio C Hamano | 2017-06-24 | 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 'ab/wildmatch-glob-slash-test' | Junio C Hamano | 2017-06-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildmatch test: cover a blind spot in "/" matchingab/wildmatch-glob-slash-test | Ævar Arnfjörð Bjarmason | 2017-06-15 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: fix erroneously copy/pasted variable in check/assert pattern | Ævar Arnfjörð Bjarmason | 2017-06-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos' | Junio C Hamano | 2017-06-24 | 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 'nd/split-index-unshare' | Junio C Hamano | 2017-06-24 | 3 | -47/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "split-index: add and use unshare_split_index()"nd/split-index-unshare | Junio C Hamano | 2017-06-24 | 3 | -47/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tenth batch for 2.14 | Junio C Hamano | 2017-06-22 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-addftime-zZ' | Junio C Hamano | 2017-06-22 | 5 | -11/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZ | Jeff King | 2017-06-15 | 2 | -2/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0006: check --date=format zone offsets | Jeff King | 2017-06-15 | 1 | -2/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strbuf: let strbuf_addftime handle %z and %Z itself | René Scharfe | 2017-06-15 | 5 | -8/+54 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test' | Junio C Hamano | 2017-06-22 | 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 'ps/stash-push-pathspec-fix' | Junio C Hamano | 2017-06-22 | 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' | Junio C Hamano | 2017-06-22 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure Git contribution guidelines for github.comls/github | Lars Schneider | 2017-06-13 | 2 | -0/+26 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/revision-parser-skip-prefix' | Junio C Hamano | 2017-06-22 | 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 'mh/fast-import-raise-default-depth' | Junio C Hamano | 2017-06-22 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: increase the default pack depth to 50mh/fast-import-raise-default-depth | Mike Hommey | 2017-06-12 | 2 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure' | Junio C Hamano | 2017-06-22 | 1 | -0/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failure | Kyle J. McKay | 2017-06-12 | 1 | -0/+42 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/filter-branch-setup' | Junio C Hamano | 2017-06-22 | 2 | -11/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: add [--] to usageah/filter-branch-setup | Andreas Heiduk | 2017-06-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: add `--setup` step | Andreas Heiduk | 2017-06-12 | 2 | -10/+25 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pc/dir-count-slashes' | Junio C Hamano | 2017-06-22 | 4 | -21/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir: create function count_slashes()pc/dir-count-slashes | Prathamesh Chavan | 2017-06-12 | 4 | -21/+15 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |