summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-03 19:18:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-03 19:18:02 -0700
commit311e5ce2cc06f7bb640be62f487e5b3d14bbb9a0 (patch)
tree26d97cd3ac03658ae61e42bcf267468f8fb0b9bc /git-rebase--merge.sh
parentMerge branch 'rs/archive-zip-many' into maint (diff)
parentcommit: don't rewrite shared index unnecessarily (diff)
downloadtgif-311e5ce2cc06f7bb640be62f487e5b3d14bbb9a0.tar.xz
Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' into maint
When re-priming the cache-tree opportunistically while committing the in-core index as-is, we mistakenly invalidated the in-core index too aggressively, causing the experimental split-index code to unnecessarily rewrite the on-disk index file(s). * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update: commit: don't rewrite shared index unnecessarily
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions