summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-09 22:37:14 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-11 00:50:24 -0800
commit17cf939724a244a56e687559fae062a3e6207145 (patch)
treedc061c1c1d406dbd8e2b247d1b27d72a397eaa6a /git-repack.sh
parentff56fe1ca7f43087fd84588af87179c2959d0cb3 (diff)
downloadgit-17cf939724a244a56e687559fae062a3e6207145.tar.gz
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>
Diffstat (limited to 'git-repack.sh')
0 files changed, 0 insertions, 0 deletions