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

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

lib

git-gui: Save the merge base during checkout_op processing

2007-07-21 05:00:36 -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

No description provided

279 MiB

Languages

C 50.5%

Shell 38.7%

Perl 4.5%

Tcl 3.2%

Python 0.8%

Other 2.1%