git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dff7e88)
git-gui: Don't allow merges in the middle of other things.
authorShawn O. Pearce <redacted>
Fri, 26 Jan 2007 09:11:10 +0000 (04:11 -0500)
committerShawn O. Pearce <redacted>
Fri, 26 Jan 2007 09:11:10 +0000 (04:11 -0500)
commit5f39dbf64f5e57c6ab7b20ba8c397df1074bc30c
tree0367b8088e70f16dc198d8fecbd8f6ad801ef6f7tree | snapshot
parentdff7e88febf85b1b8b1b789cd7c99434b70fb19bcommit | diff
git-gui: Don't allow merges in the middle of other things.

If the user is in the middle of a commit they have files which are
modified.  These may conflict with any merge that they may want
to perform, which would cause problems if the user wants to abort
a bad merge as we wouldn't have a checkpoint to roll back onto.

Signed-off-by: Shawn O. Pearce <redacted>
git-gui.sh diff | blob | history
git clone https://git.99rst.org/PROJECT