mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity
Mirror of https://github.com/git/git
268 commits 6 branches 956 tags 469 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Shawn O. Pearce 5f39dbf64f 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 <spearce@spearce.org>
2007-01-26 04:11:10 -05:00
.gitignore git-gui: Ensure version number is always current. 2007-01-21 02:54:19 -05:00
git-gui.sh git-gui: Don't allow merges in the middle of other things. 2007-01-26 04:11:10 -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: Update todo list with finished and new items. 2007-01-21 22:47:59 -05:00