undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f66b8a68f2
git-commit-vandalism/lib
History
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
..
blame.tcl git-gui: Don't show blame tooltips that we have no data for 2007-07-19 01:45:42 -04:00
branch_checkout.tcl git-gui: Allow double-click in checkout dialog to start checkout 2007-07-08 22:34:53 -04:00
branch_create.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch_delete.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch_rename.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
browser.tcl git-gui: Allow users to browse any branch, not just the current one 2007-07-18 01:39:27 -04:00
checkout_op.tcl git-gui: Factor out common fast-forward merge case 2007-07-21 05:00:37 -04:00
choose_rev.tcl git-gui: Increase the default height of the revision picker 2007-07-18 02:27:39 -04:00
class.tcl git-gui: Teach class system to support [$this cmd] syntax 2007-07-08 21:12:45 -04:00
commit.tcl git-gui: Automatically backup the user's commit buffer 2007-07-21 04:57:57 -04:00
console.tcl Merge branch 'maint' 2007-07-09 21:19:13 -04:00
database.tcl git-gui: Delay the GC hint until after we are running 2007-07-17 23:20:56 -04:00
diff.tcl git-gui: Always disable the Tcl EOF character when reading 2007-07-17 01:50:10 -04:00
encoding.tcl git-gui: Translate standard encoding names to Tcl ones 2007-07-19 01:27:17 -04:00
error.tcl git-gui: Don't crash in ask_popup if we haven't mapped main window yet 2007-07-17 22:45:53 -04:00
index.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
merge.tcl git-gui: Completely remove support for creating octopus merges 2007-07-19 02:24:25 -04:00
option.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
remote_branch_delete.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
remote.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
shortcut.tcl git-gui: Include a space in Cygwin shortcut command lines 2007-07-09 21:19:22 -04:00
status_bar.tcl git-gui: Show a progress meter for checking out files 2007-07-08 22:48:19 -04:00
transport.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00