summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: use a static lock_file structjk/config-lockfile-leak-fixJeff King2017-09-061-17/+7
* Git 2.12.4v2.12.4Junio C Hamano2017-07-303-2/+6
* Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-3011-0/+116
|\
| * Git 2.11.3v2.11.3Junio C Hamano2017-07-303-2/+6
| * Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-3010-0/+112
| |\
| | * Git 2.10.4v2.10.4Junio C Hamano2017-07-303-2/+6
| | * Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-309-0/+108
| | |\
| | | * Git 2.9.5v2.9.5maint-2.9Junio C Hamano2017-07-303-2/+6
| | | * Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-308-0/+104
| | | |\
| | | | * Git 2.8.6v2.8.6maint-2.8Junio C Hamano2017-07-303-2/+6
| | | | * Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-307-0/+100
| | | | |\
| | | | | * Git 2.7.6v2.7.6maint-2.7Junio C Hamano2017-07-303-2/+27
| | | | | * Merge branch 'jk/ssh-funny-url' into maint-2.7Junio C Hamano2017-07-286-0/+75
| | | | | |\
| | | | | | * connect: reject paths that look like command line optionsJeff King2017-07-283-0/+40
| | | | | | * connect: reject dashed arguments for proxy commandsJeff King2017-07-282-0/+10
| | | | | | * connect: factor out "looks like command line option" checkJeff King2017-07-283-1/+14
| | | | | | * t5813: add test for hostname starting with dashJeff King2017-07-281-0/+9
| | | | | | * connect: reject ssh hostname that begins with a dashJunio C Hamano2017-07-281-0/+3
| | | | | |/
* | | | | | Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12Junio C Hamano2017-07-301-2/+6
|\ \ \ \ \ \
| * | | | | | t/lib-proto-disable: restore protocol.allow after config testsJeff King2017-07-281-2/+6
|/ / / / / /
* | | | | | Git 2.12.3v2.12.3Junio C Hamano2017-05-053-4/+12
* | | | | | Merge branch 'maint-2.11' into maintJunio C Hamano2017-05-0510-8/+105
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | | | | | | |/
* | | | | | | | | Prepare for 2.12.3Junio C Hamano2017-03-282-1/+58
* | | | | | | | | Merge branch 'km/config-grammofix' into maintJunio C Hamano2017-03-281-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofixKyle Meyer2017-03-231-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/t3600-rephrase' into maintJunio C Hamano2017-03-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3600: rename test to describe its functionalitysb/t3600-rephraseStefan Beller2017-03-221-1/+1
* | | | | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' into maintJunio C Hamano2017-03-281-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7406: correct test case for submodule-update initial populationsb/submodule-update-initial-runs-custom-scriptJunio C Hamano2017-03-221-3/+3
* | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-03-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5615: fix a here-doc syntax errorjk/quote-env-path-list-componentJunio C Hamano2017-03-221-0/+1
* | | | | | | | | | | | Merge branch 'rs/update-hook-optim' into maintJunio C Hamano2017-03-281-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: simplify run_update_post_hook()rs/update-hook-optimRené Scharfe2017-03-181-8/+5
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |