| commit | 17cf939724a244a56e687559fae062a3e6207145 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 10 Nov 2005 06:37:14 +0000 (9 22:37 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 11 Nov 2005 08:50:24 +0000 (11 00:50 -0800) | ||
| tree | dc061c1c1d406dbd8e2b247d1b27d72a397eaa6a | treesnapshot (tar.gz zip) |
| parent | ff56fe1ca7f43087fd84588af87179c2959d0cb3 | commitdiff |
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>
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 | diffblobblamehistory |