summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-052-1/+10
* 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
| | | | | |/
* | | | | | RelNotes: further fixes for 2.14.2 from the master frontJunio C Hamano2017-09-101-0/+59
* | | | | | Merge branch 'jt/doc-pack-objects-fix' into maintJunio C Hamano2017-09-101-6/+11
|\ \ \ \ \ \
| * | | | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fixJonathan Tan2017-08-231-6/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jn/vcs-svn-cleanup' into maintJunio C Hamano2017-09-106-86/+56
|\ \ \ \ \ \
| * | | | | | vcs-svn: move remaining repo_tree functions to fast_export.hjn/vcs-svn-cleanupJonathan Nieder2017-08-236-55/+39
| * | | | | | vcs-svn: remove repo_delete wrapper functionJonathan Nieder2017-08-233-8/+2
| * | | | | | vcs-svn: remove custom mode constantsJonathan Nieder2017-08-234-21/+16
| * | | | | | vcs-svn: remove more unused prototypes and declarationsJonathan Nieder2017-08-231-3/+0
* | | | | | | Merge branch 'bc/vcs-svn-cleanup' into maintJunio C Hamano2017-09-103-17/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | vcs-svn: rename repo functions to "svn_repo"bc/vcs-svn-cleanupbrian m. carlson2017-08-203-10/+10
| * | | | | | vcs-svn: remove unused prototypesbrian m. carlson2017-08-201-7/+0
| |/ / / / /
* | | | | | Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \
| * | | | | | doc: fix typo in sendemail.identityjk/doc-the-thisJeff King2017-08-201-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/commit-h-single-parent-cleanup' into maintJunio C Hamano2017-09-101-5/+0
|\ \ \ \ \ \
| * | | | | | commit: remove unused inline function single_parent()rs/commit-h-single-parent-cleanupRené Scharfe2017-08-191-5/+0
* | | | | | | Merge branch 'mg/format-ref-doc-fix' into maintJunio C Hamano2017-09-103-8/+9
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-for-each-ref: clarify peeling of tags for --formatmg/format-ref-doc-fixMichael J Gruber2017-08-181-2/+3
| * | | | | | | Documentation: use proper wording for ref format stringsMichael J Gruber2017-08-183-6/+6
| |/ / / / / /
* | | | | | | Merge branch 'sb/submodule-parallel-update' into maintJunio C Hamano2017-09-101-1/+0
|\ \ \ \ \ \ \
| * | | | | | | submodule.sh: remove unused variablesb/submodule-parallel-updateStefan Beller2017-08-171-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'hv/t5526-andand-chain-fix' into maintJunio C Hamano2017-09-101-4/+4
|\ \ \ \ \ \ \
| * | | | | | | t5526: fix some broken && chainshv/t5526-andand-chain-fixHeiko Voigt2017-08-171-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'sb/sha1-file-cleanup' into maintJunio C Hamano2017-09-102-2/+2
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: make read_info_alternates staticsb/sha1-file-cleanupStefan Beller2017-08-152-2/+2
* | | | | | | | Merge branch 'rs/t1002-do-not-use-sum' into maintJunio C Hamano2017-09-102-35/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | t1002: stop using sum(1)rs/t1002-do-not-use-sumRené Scharfe2017-08-152-35/+35
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-102-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-falseAndreas Heiduk2017-08-142-6/+7
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
| | |_|_|_|_|/ / | |/| | | | | |