projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ff56fe1) | patch
octopus: do not do AND'ed merge base.
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 06:37:14 +0000 (22:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 08:50:24 +0000 (00:50 -0800)
commit17cf939724a244a56e687559fae062a3e6207145
treedc061c1c1d406dbd8e2b247d1b27d72a397eaa6atree | snapshot
parentff56fe1ca7f43087fd84588af87179c2959d0cb3commit | diff
octopus: do not do AND'ed merge base.

When doing an octopus, we incorrectly used the previous merge
base as the reference to compute next merge base.  This was
unnecessary, because that can never be better than using the
original HEAD.  And that is far simpler as well ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-octopus.sh diff | blob | history
The core git plumbing