summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Sync with v2.12.3Junio C Hamano2017-05-0811-11/+116
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| | | | | | | | | |/ / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-05-091-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t1450: avoid use of "sed" on the index, which is a binary filejh/verify-index-checksum-only-in-fsckJeff Hostetler2017-04-271-8/+26
* | | | | | | | | | | | | | | | Git 2.13-rc2v2.13.0-rc2Junio C Hamano2017-05-042-1/+4
* | | | | | | | | | | | | | | | Merge branch 'rg/a-the-typo'Junio C Hamano2017-05-044-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix minor typosrg/a-the-typoRené Genz2017-05-014-5/+5
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sr/hooks-cwd-doc'Junio C Hamano2017-05-041-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | githooks.txt: clarify push hooks are always executed in $GIT_DIRsr/hooks-cwd-docSimon Ruderich2017-05-011-2/+4
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rg/doc-submittingpatches-wordfix'Junio C Hamano2017-05-041-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | doc: update SubmittingPatchesrg/doc-submittingpatches-wordfixRené Genz2017-05-011-6/+6
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'rg/doc-pull-typofix'Junio C Hamano2017-05-041-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | doc: git-pull.txt use US spelling, fix minor typorg/doc-pull-typofixRené Genz2017-05-011-2/+3
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ja/i18n-cleanup'Junio C Hamano2017-05-042-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | i18n: read-cache: typofixja/i18n-cleanupPeter Krefting2017-05-011-1/+1
| * | | | | | | | | | | | | | | | i18n: remove i18n from tag reflog messageJean-Noel Avila2017-05-011-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merging a handful of topics before -rc2Junio C Hamano2017-04-301-0/+10
* | | | | | | | | | | | | | | | Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano2017-05-012-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase -i: reread the todo list if `exec` touched itsh/rebase-i-reread-todo-after-execStephen Hicks2017-04-272-0/+36
* | | | | | | | | | | | | | | | | Merge branch 'ls/travis-stricter-linux32-builds'Junio C Hamano2017-05-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | travis-ci: set DEVELOPER knob for Linux32 buildls/travis-stricter-linux32-buildsLars Schneider2017-04-271-0/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ls/travis-win-fix-status'Junio C Hamano2017-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | travis-ci: printf $STATUS as stringls/travis-win-fix-statusLars Schneider2017-04-261-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-init-segv-fix'Junio C Hamano2017-05-012-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fixJeff King2017-04-242-3/+11
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/prio-queue-avoid-swap-with-self'Junio C Hamano2017-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | prio_queue_reverse: don't swap elements with themselvesjk/prio-queue-avoid-swap-with-selfJeff King2017-04-241-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'ab/align-perf-descriptions'Junio C Hamano2017-05-012-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t/perf: correctly align non-ASCII descriptions in outputab/align-perf-descriptionsÆvar Arnfjörð Bjarmason2017-04-232-0/+5
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/complete-checkout-sans-dwim-remote'Junio C Hamano2017-05-011-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | completion: optionally disable checkout DWIMjk/complete-checkout-sans-dwim-remoteJeff King2017-04-231-1/+10
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Git 2.13-rc1v2.13.0-rc1Junio C Hamano2017-04-262-1/+40