Shawn O. Pearce f66b8a68f2 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>

2007-07-21 05:00:37 -04:00

lib

git-gui: Factor out common fast-forward merge case

2007-07-21 05:00:37 -04:00

.gitignore

git-gui: Refactor into multiple files to save my sanity

2007-05-07 23:35:48 -04:00

git-gui.sh

git-gui: Automatically backup the user's commit buffer

2007-07-21 04:57:57 -04:00

GIT-VERSION-GEN

Merge branch 'maint'

2007-06-11 19:06:15 -04:00

Makefile

Merge branch 'maint'

2007-06-27 00:36:38 -04:00

Description

Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.

chacktoberfestshell

828 MiB

Languages

C 50.1%

Shell 38.4%

Perl 5.1%

Tcl 3.2%

Python 0.8%

Other 2.1%