mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 19:33:59 +01:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
859 Commits 6 Branches 956 Tags 311 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
0aea2842d9
Go to file
Alexander Gavrilov 0aea2842d9 git-gui: Make Ctrl-T safe to use for conflicting files. 
A previous patch added a check for conflict markers, which
is done when the file is about to be staged due to a click
on the icon. However, pressing Ctrl-T still immediately
stages the file without confirmation. This patch fixes it.

The check requires a loaded diff, so staging multiple files
at once won't work if they are unmerged.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-09-30 11:47:33 -07:00
lib git-gui: Make Ctrl-T safe to use for conflicting files. 2008-09-30 11:47:33 -07:00
macosx
po
windows
.gitattributes
.gitignore
git-gui.sh git-gui: Make Ctrl-T safe to use for conflicting files. 2008-09-30 11:47:33 -07:00
GIT-VERSION-GEN
Makefile