summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'sn/reset-doc-typofix'Junio 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'Junio 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 'rs/pretty-add-again'Junio C Hamano2017-06-243-45/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-153-45/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-highlight-module'Junio C Hamano2017-06-245-19/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: split code into modulejk/diff-highlight-moduleJeff King2017-06-155-19/+82
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch-glob-slash-test'Junio C Hamano2017-06-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildmatch test: cover a blind spot in "/" matchingab/wildmatch-glob-slash-testÆvar Arnfjörð Bjarmason2017-06-151-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: fix erroneously copy/pasted variable in check/assert patternÆvar Arnfjörð Bjarmason2017-06-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetools-meld-output-opt-on-macos'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macosDavid Aguilar2017-06-181-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/split-index-unshare'Junio C Hamano2017-06-243-47/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "split-index: add and use unshare_split_index()"nd/split-index-unshareJunio C Hamano2017-06-243-47/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tenth batch for 2.14Junio C Hamano2017-06-221-0/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-addftime-zZ'Junio C Hamano2017-06-225-11/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date: use localtime() for "-local" time formatsrs/strbuf-addftime-zZJeff King2017-06-152-2/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0006: check --date=format zone offsetsJeff King2017-06-151-2/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strbuf: let strbuf_addftime handle %z and %Z itselfRené Scharfe2017-06-155-8/+54
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test'Junio C Hamano2017-06-221-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3200: add test for single parameter passed to -m optionsd/t3200-branch-m-testSahil Dua2017-06-131-0/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/stash-push-pathspec-fix'Junio C Hamano2017-06-222-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-stash: fix pushing stash with pathspec from subdirps/stash-push-pathspec-fixPatrick Steinhardt2017-06-132-0/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/github'Junio C Hamano2017-06-222-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure Git contribution guidelines for github.comls/githubLars Schneider2017-06-132-0/+26
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/revision-parser-skip-prefix'Junio C Hamano2017-06-222-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 'mh/fast-import-raise-default-depth'Junio C Hamano2017-06-222-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: increase the default pack depth to 50mh/fast-import-raise-default-depthMike Hommey2017-06-122-2/+2
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'km/test-mailinfo-b-failure'Junio C Hamano2017-06-221-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5100: add some more mailinfo testskm/test-mailinfo-b-failureKyle J. McKay2017-06-121-0/+42
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/filter-branch-setup'Junio C Hamano2017-06-222-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: add [--] to usageah/filter-branch-setupAndreas Heiduk2017-06-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: add `--setup` stepAndreas Heiduk2017-06-122-10/+25
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-224-21/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir: create function count_slashes()pc/dir-count-slashesPrathamesh Chavan2017-06-124-21/+15
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |