Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update' into maint | Junio C Hamano | 2018-03-22 | 1 | -6/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maint | Junio C Hamano | 2018-03-22 | 1 | -16/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/worktree-add-short-help' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tz/doc-show-defaults-to-head' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/shared-index-fix' into maint | Junio C Hamano | 2018-03-22 | 2 | -18/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/mailinfo-cleanup-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rb/hashmap-h-compilation-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/describe-unique-abbrev' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/submodule-doc-updates' into maint | Junio C Hamano | 2018-03-22 | 2 | -29/+87 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cl/t9001-cleanup' into maint | Junio C Hamano | 2018-03-22 | 1 | -10/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/oidmap-autoinit' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/test-i18ngrep' into maint | Junio C Hamano | 2018-03-22 | 8 | -43/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/fsck-code-cleanup' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/svn-branch-segfault-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/list-merge-strategy' into maint | Junio C Hamano | 2018-03-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/daemon-fixes' into maint | Junio C Hamano | 2018-03-22 | 4 | -20/+107 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/split-index-fixes' into maint | Junio C Hamano | 2018-03-22 | 8 | -17/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mr/packed-ref-store-fix' into maint | Junio C Hamano | 2018-03-22 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/http-redact-cookies' into maint | Junio C Hamano | 2018-03-22 | 3 | -8/+117 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-flush-before-warning' into maint | Junio C Hamano | 2018-03-22 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/travis-build-during-script-phase' into maint | Junio C Hamano | 2018-03-22 | 3 | -15/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.17-rc1v2.17.0-rc1 | Junio C Hamano | 2018-03-21 | 2 | -1/+33 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/attributes-path-doc' | Junio C Hamano | 2018-03-21 | 1 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/gitattributes: mention non-recursive behaviorjk/attributes-path-doc | Jeff King | 2018-03-20 | 1 | -3/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/warning-uninitialized-fix' | Junio C Hamano | 2018-03-21 | 4 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read-cache: fix an -Wmaybe-uninitialized warningrj/warning-uninitialized-fix | Ramsay Jones | 2018-03-20 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wuninitialized: remove some 'init-self' workarounds | Ramsay Jones | 2018-03-20 | 3 | -4/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/complete-tag-delete-tagname' | Junio C Hamano | 2018-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete tags with git tag --delete/--verifytz/complete-tag-delete-tagname | Todd Zullinger | 2018-03-19 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ml/filter-branch-portability-fix' | Junio C Hamano | 2018-03-21 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: use printf instead of echo -eml/filter-branch-portability-fix | Michele Locati | 2018-03-19 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/ming-strftime' | Junio C Hamano | 2018-03-21 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: abort on invalid strftime formatsjs/ming-strftime | Johannes Schindelin | 2018-03-19 | 2 | -0/+14 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dp/merge-strategy-doc-fix' | Junio C Hamano | 2018-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/merge-strategies: typofixdp/merge-strategy-doc-fix | David Pursehouse | 2018-03-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/relnotes-1.7-on-perl' | Junio C Hamano | 2018-03-21 | 2 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: add details on Perl module changestz/relnotes-1.7-on-perl | Todd Zullinger | 2018-03-16 | 2 | -1/+16 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rj/http-code-cleanup' | Junio C Hamano | 2018-03-21 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http: fix an unused variable warning for 'curl_no_proxy'rj/http-code-cleanup | Ramsay Jones | 2018-03-15 | 1 | -1/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/t3200-typofix' | Junio C Hamano | 2018-03-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3200: fix a typo in a test descriptionks/t3200-typofix | Kaartic Sivaraam | 2018-03-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/transfer-fsck-with-promissor' | Junio C Hamano | 2018-03-21 | 5 | -4/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: do not check links for partial fetchjt/transfer-fsck-with-promissor | Jonathan Tan | 2018-03-15 | 2 | -2/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: support checking objects but not links | Jonathan Tan | 2018-03-15 | 3 | -2/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/refresh-cache-ent-rehash-fix' | Junio C Hamano | 2018-03-21 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bugs preventing adding updated cache entries to the name hashbp/refresh-cache-ent-rehash-fix | Ben Peart | 2018-03-15 | 1 | -1/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/fsck-promisors' | Junio C Hamano | 2018-03-21 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: restore OBJECT_INFO_QUICK functionalityjh/fsck-promisors | Jonathan Tan | 2018-03-13 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ma/skip-writing-unchanged-index' | Junio C Hamano | 2018-03-21 | 10 | -40/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-index | Martin Ă…gren | 2018-03-01 | 10 | -40/+37 |