H0llyW00dzZ/git: 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. - git

mirror of https://github.com/git/git.git synced 2025-04-14 23:16:52 +00:00

Go to file

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.