Shawn O. Pearce eea1ab6e23 git-gui: Simplify error case for unsupported merge types ...

If we are given a merge type we don't understand in checkout_op there
is probably a bug in git-gui somewhere that allowed this unknown merge
strategy to come into this part of the code path.  We currently only
recognize three merge types ('none', 'ff' and 'reset') but are going
to be supporting more in the future.  Rather than keep editing this
message I'm going with a very generic "Uh, we don't do that!" type of
error.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

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

lib

git-gui: Simplify error case for unsupported merge types

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

No description provided

279 MiB

Languages

C 50.5%

Shell 38.7%

Perl 4.5%

Tcl 3.2%

Python 0.8%

Other 2.1%