summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:32 -0700
commit676c7e50b10f1fbb2ce06e46260f15f3a20679f7 (patch)
treeefc43befda409ef7c1faa60789397c352670aa98 /mergetools/gvimdiff2
parentMerge branch 'dj/runtime-prefix' (diff)
parentfilter-branch: skip commits present on --state-branch (diff)
downloadtgif-676c7e50b10f1fbb2ce06e46260f15f3a20679f7.tar.xz
Merge branch 'mb/filter-branch-optim'
"git filter-branch" when used with the "--state-branch" option still attempted to rewrite the commits whose filtered result is known from the previous attempt (which is recorded on the state branch); the command has been corrected not to waste cycles doing so. * mb/filter-branch-optim: filter-branch: skip commits present on --state-branch
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions