summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees.c: align submodule error message to the other error messagessb/unpack-trees-would-lose-submodule-message-updateStefan Beller2017-03-291-1/+1
* Ninth batch for 2.13Junio C Hamano2017-03-281-30/+24
* Sync with 'maint'Junio C Hamano2017-03-281-0/+57
|\
| * Prepare for 2.12.3Junio C Hamano2017-03-282-1/+58
| * Merge branch 'km/config-grammofix' into maintJunio C Hamano2017-03-281-3/+3
| |\
| * \ Merge branch 'sb/t3600-rephrase' into maintJunio C Hamano2017-03-281-1/+1
| |\ \
| * \ \ Merge branch 'sb/submodule-update-initial-runs-custom-script' into maintJunio C Hamano2017-03-281-3/+3
| |\ \ \
| * \ \ \ Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-03-281-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/update-hook-optim' into maintJunio C Hamano2017-03-281-8/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/shortlog-cleanup' into maintJunio C Hamano2017-03-281-1/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/path-name-safety-cleanup' into maintJunio C Hamano2017-03-281-2/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/http-push-cleanup' into maintJunio C Hamano2017-03-281-5/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/wt-status-cleanup' into maintJunio C Hamano2017-03-281-15/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-name-cleanups' into maintJunio C Hamano2017-03-286-46/+57
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-cleanup' into maintJunio C Hamano2017-03-281-52/+57
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/blame-code-cleanup' into maintJunio C Hamano2017-03-281-17/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'st/verify-tag' into maintJunio C Hamano2017-03-282-14/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2017-03-282-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/http-alternates-as-redirects-warning' into maintJunio C Hamano2017-03-281-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/filter-branch-prune-empty' into maintJunio C Hamano2017-03-284-8/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maintJunio C Hamano2017-03-287-30/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-2810-51/+249
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/cond-skip-tests' into maintJunio C Hamano2017-03-283-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ident-empty' into maintJunio C Hamano2017-03-282-19/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/delta-chain-limit' into maintJunio C Hamano2017-03-283-23/+207
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/test-with-stdin' into maintJunio C Hamano2017-03-282-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interop-test' into maintJunio C Hamano2017-03-288-1/+270
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/perf-updates' into maintJunio C Hamano2017-03-283-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-286-2/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/parse-config-key-cleanup' into maintJunio C Hamano2017-03-283-10/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1dc'Junio C Hamano2017-03-281-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1dc: avoid CPP macro collisionsjk/sha1dcJunio C Hamano2017-03-261-5/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2017-03-289-9/+848
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add test-lazy-init-name-hash to .gitignoreRamsay Jones2017-03-241-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add perf test for lazy_init_name_hashJeff Hostetler2017-03-241-0/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: add test-lazy-init-name-hashJeff Hostetler2017-03-243-0/+266
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: perf improvement for lazy_init_name_hashJeff Hostetler2017-03-241-7/+485
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: document memihash_cont, hashmap_disallow_rehash apiJeff Hostetler2017-03-231-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: add disallow_rehash settingJeff Hostetler2017-03-222-1/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: allow memihash computation to be continuedJeff Hostetler2017-03-222-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash: specify initial size for istate.dir_hash tableJeff Hostetler2017-03-221-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-import-cleanup'Junio C Hamano2017-03-285-16/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack.h: define largest possible encoded object sizejk/fast-import-cleanupJeff King2017-03-242-2/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encode_in_pack_object_header: respect output buffer lengthJeff King2017-03-245-10/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: use xsnprintf for formatting headersJeff King2017-03-241-3/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: use xsnprintf for writing sha1sJeff King2017-03-241-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/skip-prefix-in-prettify-refname'Junio C Hamano2017-03-281-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs.c: use skip_prefix() in prettify_refname()sg/skip-prefix-in-prettify-refnameSZEDER Gábor2017-03-231-5/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/branch-list-doc'Junio C Hamano2017-03-281-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \