diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-20 03:34:56 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-21 05:00:37 -0400 |
| commit | f66b8a68f21d7dba6b80ba213315974476001b93 (patch) | |
| tree | 216389df848c5c75b8a8863f8a78d92577d6637e /lib/commit.tcl | |
| parent | git-gui: Save the merge base during checkout_op processing (diff) | |
| download | git-f66b8a68f21d7dba6b80ba213315974476001b93.tar.gz git-f66b8a68f21d7dba6b80ba213315974476001b93.zip | |
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>
Diffstat (limited to 'lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions