Shawn O. Pearce 14efcc7485 git-gui: Correct unmerged file detection at commit time. ...

Its impossible to commit an index which has unmerged stages.

Unfortunately a bug in git-gui allowed the user to try to do exactly that,
as we broke out of our file scanning loop as soon as we found a valid AMD
index state.  That's wrong, as the files are coming back from our array
in pseudo-random order; an unmerged file may get returned only after all
merged files.

I also noticed the grammer around here in our dialog boxes still used
the term 'include', so this has been updated to reflect current usage.

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

2007-01-21 22:47:55 -05:00

.gitignore

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

git-gui.sh

git-gui: Correct unmerged file detection at commit time.

2007-01-21 22:47:55 -05:00

GIT-VERSION-GEN

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

Makefile

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

TODO

git-gui: Updated todo list.

2006-11-25 23:16:16 -05:00

Description

No description provided

636 MiB

Languages

C 50.4%

Shell 38.8%

Perl 4.4%

Tcl 3.1%

Python 0.8%

Other 2.3%