summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené Scharfe2017-06-272-0/+33
* apply: check git diffs for invalid file modesRené Scharfe2017-06-272-6/+27
* apply: check git diffs for missing old filenamesRené Scharfe2017-06-272-1/+26
* Git 2.11.2v2.11.2Junio C Hamano2017-05-054-3/+16
* Merge branch 'maint-2.10' into maint-2.11Junio C Hamano2017-05-059-8/+92
|\
| * Git 2.10.3v2.10.3Junio C Hamano2017-05-053-2/+10
| * Merge branch 'maint-2.9' into maint-2.10Junio C Hamano2017-05-058-7/+83
| |\
| | * Git 2.9.4v2.9.4Junio C Hamano2017-05-053-2/+11
| | * Merge branch 'maint-2.8' into maint-2.9Junio C Hamano2017-05-057-6/+74
| | |\
| | | * Git 2.8.5v2.8.5Junio C Hamano2017-05-054-3/+16
| | | * Merge branch 'maint-2.7' into maint-2.8Junio C Hamano2017-05-056-5/+60
| | | |\
| | | | * Git 2.7.5v2.7.5Junio C Hamano2017-05-054-3/+19
| | | | * Merge branch 'maint-2.6' into maint-2.7Junio C Hamano2017-05-055-4/+43
| | | | |\
| | | | | * Git 2.6.7v2.6.7maint-2.6Junio C Hamano2017-05-054-3/+16
| | | | | * Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2017-05-054-3/+29
| | | | | |\
| | | | | | * Git 2.5.6v2.5.6maint-2.5Junio C Hamano2017-05-054-3/+16
| | | | | | * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2017-05-053-2/+15
| | | | | | |\
| | | | | | | * Git 2.4.12v2.4.12maint-2.4Junio C Hamano2017-05-054-3/+16
| | | | | | | * Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4Junio C Hamano2017-05-051-1/+1
| | | | | | | |\
| | | | | | | | * shell: disallow repo names beginning with dashjk/shell-no-repository-that-begins-with-dashJeff King2017-05-051-1/+1
| | | | | | | |/
* | | | | | | | Git 2.11.1v2.11.1Junio C Hamano2017-02-021-0/+3
* | | | | | | | Merge branch 'ws/request-pull-code-cleanup' into maintJunio C Hamano2017-02-021-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | request-pull: drop old USAGE stuffws/request-pull-code-cleanupWolfram Sang2017-01-151-3/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-02-023-21/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | execv_dashed_external: wait for child on signal deathJeff King2017-01-093-0/+21
| * | | | | | | | execv_dashed_external: stop exiting with negative codeJeff King2017-01-091-3/+7
| * | | | | | | | execv_dashed_external: use child_process structJeff King2017-01-091-18/+7
* | | | | | | | | Ready for 2.11.1Junio C Hamano2017-01-311-0/+45
* | | | | | | | | Merge branch 'sb/in-core-index-doc' into maintJunio C Hamano2017-01-313-22/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | documentation: retire unfinished documentationsb/in-core-index-docStefan Beller2017-01-191-21/+0
| * | | | | | | | | cache.h: document add_[file_]to_indexStefan Beller2017-01-191-0/+10
| * | | | | | | | | cache.h: document remove_index_entry_atStefan Beller2017-01-192-1/+3
| * | | | | | | | | cache.h: document index_name_posStefan Beller2017-01-191-0/+19
* | | | | | | | | | Merge branch 'js/mingw-isatty' into maintJunio C Hamano2017-01-311-7/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mingw: follow-up to "replace isatty() hack"Johannes Schindelin2017-01-181-7/+4
* | | | | | | | | | | Merge branch 'jk/coding-guidelines-update' into maintJunio C Hamano2017-01-311-5/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CodingGuidelines: clarify multi-line brace stylejk/coding-guidelines-updateJeff King2017-01-171-5/+32
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/exec-path-coverity-workaround' into maintJunio C Hamano2017-01-311-6/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git_exec_path: do not return the result of getenv()js/exec-path-coverity-workaroundJeff King2017-01-091-9/+8
| * | | | | | | | | | | git_exec_path: avoid Coverity warning about unfree()d resultJohannes Schindelin2017-01-081-1/+4
* | | | | | | | | | | | Merge branch 'ad/bisect-terms' into maintJunio C Hamano2017-01-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/bisect: improve on (bad|new) and (good|bad)ad/bisect-termsChristian Couder2017-01-131-2/+2
* | | | | | | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maintJunio C Hamano2017-01-311-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posixJeff King2017-01-111-11/+15
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'km/branch-get-push-while-detached' into maintJunio C Hamano2017-01-312-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-072-3/+9
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/rebase-i-squash-count-fix' into maintJunio C Hamano2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase--interactive: count squash commits above 10 correctlyjk/rebase-i-squash-count-fixJeff King2017-01-071-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-313-10/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-072-9/+131