| commit | 60f7352fe1ae3d42ca7bd7611b6b787ff70cd813 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 20 Jul 2007 06:13:24 +0000 (20 02:13 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 21 Jul 2007 09:00:36 +0000 (21 05:00 -0400) | ||
| tree | c6bc6c5e790a3b5679ab4e8f641c05bb2c8d530c | treesnapshot (tar.gz zip) |
| parent | 4578c5cb690df98d0d5fbea043114b4b7dec8f57 | commitdiff |
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>
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>
| lib/checkout_op.tcl | diffblobblamehistory |