| commit | f66b8a68f21d7dba6b80ba213315974476001b93 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 20 Jul 2007 07:34:56 +0000 (20 03:34 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 21 Jul 2007 09:00:37 +0000 (21 05:00 -0400) | ||
| tree | 216389df848c5c75b8a8863f8a78d92577d6637e | treesnapshot (tar.gz zip) |
| parent | 60f7352fe1ae3d42ca7bd7611b6b787ff70cd813 | commitdiff |
git-gui: Factor out common fast-forward merge case
In both the ff and reset merge_types supported by checkout_op the
result is the same if the merge base of our target commit and the
existing commit is the existing commit: its a fast-forward as the
existing commit is fully contained in the target commit.
This minor cleanup in logic will make it easier to implement a
new kind of merge_type that actually merges the two trees with a
real merge strategy, such as git-merge-recursive.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
In both the ff and reset merge_types supported by checkout_op the
result is the same if the merge base of our target commit and the
existing commit is the existing commit: its a fast-forward as the
existing commit is fully contained in the target commit.
This minor cleanup in logic will make it easier to implement a
new kind of merge_type that actually merges the two trees with a
real merge strategy, such as git-merge-recursive.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/checkout_op.tcl | diffblobblamehistory |