From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 20 Jul 2007 06:13:24 +0000 (-0400)
Subject: git-gui: Save the merge base during checkout_op processing
X-Git-Tag: gitgui-0.8.0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60f7352fe1ae3d42ca7bd7611b6b787ff70cd813?hp=60f7352fe1ae3d42ca7bd7611b6b787ff70cd813

git-gui: Save the merge base during checkout_op processing

I've decided to teach checkout_op how to perform more than just a
fast-forward and reset type of merge.  This way we can also do a full
recursive merge even when we are recreating an existing branch from
a remote.  To help with that process I'm saving the merge-base we
computed during the ff/reset/fail decision process, in case we need
it later on when we actually start a true merge operation.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---