mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 20:28:13 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
854 Commits 6 Branches 956 Tags 349 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
3e34838caf
Go to file
Alexander Gavrilov 3e34838caf git-gui: Reenable staging unmerged files by clicking the icon. 
This restores functionality of the file icon for unmerged files.
Safety is enforced by loading the diff and checking for lines
that look like conflict markers. If such lines are found, or
the conflict involves deletion and/or symlinks, a confirmation
dialog is presented. Otherwise, the icon immediately stages the
working copy version of the file.

Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
(Restore ability to Stage Working Copy for conflicts)

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-09-24 12:51:43 -07:00
lib git-gui: Reenable staging unmerged files by clicking the icon. 2008-09-24 12:51:43 -07:00
macosx git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk 2008-07-25 15:08:33 -07:00
po git-gui: Updated German translation. 2008-09-13 14:24:16 -07:00
windows git-gui (Windows): Change wrapper to execdir 'libexec/git-core' 2008-07-29 22:43:37 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -07:00
.gitignore git-gui: Honor a config.mak in git-gui's top level 2007-10-13 22:14:14 -04:00
git-gui.sh git-gui: Reenable staging unmerged files by clicking the icon. 2008-09-24 12:51:43 -07:00
GIT-VERSION-GEN git-gui 0.11 2008-08-10 00:02:08 -07:00
Makefile git-gui (Windows): Switch to relative discovery of oguilib 2008-07-29 22:43:37 -07:00