diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-20 02:13:24 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-21 05:00:36 -0400 |
| commit | 60f7352fe1ae3d42ca7bd7611b6b787ff70cd813 (patch) | |
| tree | c6bc6c5e790a3b5679ab4e8f641c05bb2c8d530c /lib/commit.tcl | |
| parent | git-gui: Automatically backup the user's commit buffer (diff) | |
| download | git-60f7352fe1ae3d42ca7bd7611b6b787ff70cd813.tar.gz git-60f7352fe1ae3d42ca7bd7611b6b787ff70cd813.zip | |
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>
Diffstat (limited to 'lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions