summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-03-12 13:39:31 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-12 13:39:31 -0800
commita41e109c4bcd56537fc3801623b1aa0dd4e06f1c (patch)
tree404a4098a6690de784d522780d615646cf4a2c22 /git-merge-octopus.sh
parentannotate-tests: override VISUAL when running tests. (diff)
downloadtgif-a41e109c4bcd56537fc3801623b1aa0dd4e06f1c.tar.xz
revision traversal: --remove-empty fix.
Marco Costalba reports that --remove-empty omits the commit that created paths we are interested in. try_to_simplify_commit() logic was dropping a parent we introduced those paths against, which I think is not what we meant. Instead, this marks such parent uninteresting. The traversal does not go beyond that parent as advertised, but we still say that the current commit changed things from that parent. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions