summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SQUASH??? fast-import: fix a sparse 'NULL pointer' warningjm/mem-poolRamsay Jones2018-03-301-1/+1
* Move reusable parts of memory pool into its own fileJameson Miller2018-03-274-69/+91
* fast-import: introduce mem_pool typeJameson Miller2018-03-271-28/+50
* fast-import: rename mem_pool type to mp_blockJameson Miller2018-03-271-10/+10
* Sync with Git 2.16.3Junio C Hamano2018-03-221-0/+49
|\
| * Git 2.16.3v2.16.3snapJunio C Hamano2018-03-223-2/+51
| * Merge branch 'ms/non-ascii-ticks' into maintJunio C Hamano2018-03-221-7/+7
| |\
| * \ Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-225-46/+1
| |\ \
| * \ \ Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-222-2/+7
| |\ \ \
| * \ \ \ Merge branch 'tg/worktree-create-tracking' into maintJunio C Hamano2018-03-221-2/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'gs/test-unset-xdg-cache-home' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/status-doc-fix' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rd/typofix' into maintJunio C Hamano2018-03-225-6/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bp/fsmonitor' into maintJunio C Hamano2018-03-221-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/doc-interpret-trailers-grammofix' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sg/doc-test-must-fail-args' into maintJunio C Hamano2018-03-222-2/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/sparse-updates' into maintJunio C Hamano2018-03-222-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/gettext-poison' into maintJunio C Hamano2018-03-222-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \