summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'ik/userdiff-html-h-element-fix'Junio C Hamano2017-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | userdiff: fix HTML hunk header regexpik/userdiff-html-h-element-fixIlya Kantor2017-09-241-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/fallthrough'Junio C Hamano2017-09-2815-28/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-2213-4/+15
| * | | | | | | | | | curl_trace(): eliminate switch fallthroughJeff King2017-09-221-3/+4
| * | | | | | | | | | test-line-buffer: simplify command parsingJeff King2017-09-221-21/+11
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-09-282-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-222-2/+7
* | | | | | | | | | | Merge branch 'hn/typofix'Junio C Hamano2017-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule.h: typofixhn/typofixHan-Wen Nienhuys2017-09-221-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'Junio C Hamano2017-09-282-8/+94
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | filter-branch: use hash-object instead of mktagic/fix-filter-branch-to-handle-tag-without-taggerIan Campbell2017-09-221-1/+1
| * | | | | | | | | | | filter-branch: stash away ref map in a branchIan Campbell2017-09-222-2/+55
| * | | | | | | | | | | filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*Ian Campbell2017-09-221-0/+33
| * | | | | | | | | | | filter-branch: reset $GIT_* before cleaning upIan Campbell2017-09-221-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2017-09-282-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-172-4/+11
* | | | | | | | | | | Sync with 2.14.2Junio C Hamano2017-09-2611-56/+183
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 2.14.2v2.14.2Junio C Hamano2017-09-221-0/+11
| * | | | | | | | | | | Sync with 2.13.6Junio C Hamano2017-09-2210-56/+172
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Git 2.13.6v2.13.6maint-2.13Junio C Hamano2017-09-223-2/+19
| | * | | | | | | | | | Sync with 2.12.5Junio C Hamano2017-09-229-56/+155
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Git 2.12.5v2.12.5maint-2.12Junio C Hamano2017-09-223-2/+19
| | | * | | | | | | | | | Sync with 2.11.4Junio C Hamano2017-09-228-56/+138
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Git 2.11.4v2.11.4maint-2.11Junio C Hamano2017-09-223-2/+19
| | | | * | | | | | | | | Sync with 2.10.5Junio C Hamano2017-09-227-56/+121
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Git 2.10.5v2.10.5maint-2.10Junio C Hamano2017-09-223-2/+19
| | | | | * | | | | | | | Merge branch 'jk/safe-pipe-capture' into maint-2.10Junio C Hamano2017-09-221-2/+2
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | archimport: use safe_pipe_capture for user inputjk/safe-pipe-captureJeff King2017-09-121-2/+2
| | | | | * | | | | | | | | Merge branch 'jk/cvsimport-quoting' into maint-2.10Junio C Hamano2017-09-221-0/+1
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | cvsimport: shell-quote variable used in backticksJeff King2017-09-121-0/+1
| | | | | | |/ / / / / / / /
| | | | | * | | | | | | | | Merge branch 'jc/cvsserver' into maint-2.10Junio C Hamano2017-09-221-40/+37
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | cvsserver: use safe_pipe_capture for `constant commands` as welljc/cvsserverJunio C Hamano2017-09-111-4/+4
| | | | | | * | | | | | | | | cvsserver: use safe_pipe_capture instead of backticksjoernchen2017-09-111-11/+11
| | | | | | * | | | | | | | | cvsserver: move safe_pipe_capture() to the main packageJunio C Hamano2017-09-111-25/+22
| | | | | | |/ / / / / / / /
| | | | | * | | | | | | | | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10Junio C Hamano2017-09-223-14/+64
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserverJeff King2017-09-123-14/+64
| | | | | | |/ / / / / / /
* | | | | | | | | | | | | The ninth batch for 2.15Junio C Hamano2017-09-251-0/+67
* | | | | | | | | | | | | Merge branch 'ks/test-readme-phrasofix'Junio C Hamano2017-09-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofixKaartic Sivaraam2017-09-191-3/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano2017-09-253-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-parse: rev-parse: add --is-shallow-repositoryow/rev-parse-is-shallow-repoØystein Walle2017-09-193-0/+23
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rj/test-ulimit-on-windows'Junio C Hamano2017-09-255-40/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9010-*.sh: skip all tests if the PIPE prereq is missingrj/test-ulimit-on-windowsRamsay Jones2017-09-191-27/+28
| * | | | | | | | | | | | | test-lib: use more compact expression in PIPE prerequisiteRamsay Jones2017-09-191-8/+2
| * | | | | | | | | | | | | test-lib: don't use ulimit in test prerequisites on cygwinRamsay Jones2017-09-154-5/+12
* | | | | | | | | | | | | | Merge branch 'jk/info-alternates-fix'Junio C Hamano2017-09-251-20/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | read_info_alternates: warn on non-trivial errorsJeff King2017-09-201-0/+1
| * | | | | | | | | | | | | | Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fixJunio C Hamano2017-09-201-20/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | read_info_alternates: read contents into strbufjk/info-alternates-fix-2.11Jeff King2017-09-201-20/+10
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |