summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
* 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
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/shortlog-cleanup' into maintJunio C Hamano2017-03-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanupRené Scharfe2017-03-181-1/+0
* | | | | | | | | | | | | Merge branch 'rs/path-name-safety-cleanup' into maintJunio C Hamano2017-03-281-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revision: remove declaration of path_name()rs/path-name-safety-cleanupRené Scharfe2017-03-181-2/+0
* | | | | | | | | | | | | | Merge branch 'rs/http-push-cleanup' into maintJunio C Hamano2017-03-281-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http-push: don't check return value of lookup_unknown_object()rs/http-push-cleanupRené Scharfe2017-03-181-5/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sb/wt-status-cleanup' into maintJunio C Hamano2017-03-281-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanupStefan Beller2017-03-171-15/+5
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-286-46/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanupsJeff King2017-03-161-8/+12
| * | | | | | | | | | | | | | replace snprintf with odb_pack_name()Jeff King2017-03-162-31/+24
| * | | | | | | | | | | | | | odb_pack_keep(): stop generating keepfile nameJeff King2017-03-164-12/+12
| * | | | | | | | | | | | | | sha1_file.c: make pack-name helper globally accessibleJeff King2017-03-162-11/+15
| * | | | | | | | | | | | | | move odb_* declarations out of git-compat-util.hJeff King2017-03-162-2/+12
* | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-cleanup' into maintJunio C Hamano2017-03-281-52/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanupJeff King2017-03-151-29/+16
| * | | | | | | | | | | | | | | rev-parse: add helper for parsing "--foo/--foo="Jeff King2017-03-151-10/+28
| * | | | | | | | | | | | | | | rev-parse: use skip_prefix when parsing optionsJeff King2017-03-151-20/+20
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \