summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' into maintJunio C Hamano2018-03-221-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maintJunio C Hamano2018-03-221-16/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/worktree-add-short-help' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/doc-show-defaults-to-head' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/shared-index-fix' into maintJunio C Hamano2018-03-222-18/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/mailinfo-cleanup-fix' into maintJunio C Hamano2018-03-221-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rb/hashmap-h-compilation-fix' into maintJunio C Hamano2018-03-221-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/describe-unique-abbrev' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/submodule-doc-updates' into maintJunio C Hamano2018-03-222-29/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cl/t9001-cleanup' into maintJunio C Hamano2018-03-221-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/oidmap-autoinit' into maintJunio C Hamano2018-03-221-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-i18ngrep' into maintJunio C Hamano2018-03-228-43/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/svn-branch-segfault-fix' into maintJunio C Hamano2018-03-221-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/list-merge-strategy' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-fixes' into maintJunio C Hamano2018-03-224-20/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/split-index-fixes' into maintJunio C Hamano2018-03-228-17/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mr/packed-ref-store-fix' into maintJunio C Hamano2018-03-221-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/http-redact-cookies' into maintJunio C Hamano2018-03-223-8/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/travis-build-during-script-phase' into maintJunio C Hamano2018-03-223-15/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.17-rc1v2.17.0-rc1Junio C Hamano2018-03-212-1/+33
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/attributes-path-doc'Junio C Hamano2018-03-211-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/gitattributes: mention non-recursive behaviorjk/attributes-path-docJeff King2018-03-201-3/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano2018-03-214-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-cache: fix an -Wmaybe-uninitialized warningrj/warning-uninitialized-fixRamsay Jones2018-03-201-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wuninitialized: remove some 'init-self' workaroundsRamsay Jones2018-03-203-4/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/complete-tag-delete-tagname'Junio C Hamano2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete tags with git tag --delete/--verifytz/complete-tag-delete-tagnameTodd Zullinger2018-03-191-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ml/filter-branch-portability-fix'Junio C Hamano2018-03-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: use printf instead of echo -eml/filter-branch-portability-fixMichele Locati2018-03-191-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/ming-strftime'Junio C Hamano2018-03-212-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: abort on invalid strftime formatsjs/ming-strftimeJohannes Schindelin2018-03-192-0/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dp/merge-strategy-doc-fix'Junio C Hamano2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/merge-strategies: typofixdp/merge-strategy-doc-fixDavid Pursehouse2018-03-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/relnotes-1.7-on-perl'Junio C Hamano2018-03-212-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: add details on Perl module changestz/relnotes-1.7-on-perlTodd Zullinger2018-03-162-1/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/http-code-cleanup'Junio C Hamano2018-03-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http: fix an unused variable warning for 'curl_no_proxy'rj/http-code-cleanupRamsay Jones2018-03-151-1/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/t3200-typofix'Junio C Hamano2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3200: fix a typo in a test descriptionks/t3200-typofixKaartic Sivaraam2018-03-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/transfer-fsck-with-promissor'Junio C Hamano2018-03-215-4/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: do not check links for partial fetchjt/transfer-fsck-with-promissorJonathan Tan2018-03-152-2/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: support checking objects but not linksJonathan Tan2018-03-153-2/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/refresh-cache-ent-rehash-fix'Junio C Hamano2018-03-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bugs preventing adding updated cache entries to the name hashbp/refresh-cache-ent-rehash-fixBen Peart2018-03-151-1/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/fsck-promisors'Junio C Hamano2018-03-211-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: restore OBJECT_INFO_QUICK functionalityjh/fsck-promisorsJonathan Tan2018-03-131-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-2110-40/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ă…gren2018-03-0110-40/+37