Alexander Gavrilov 2fe5b2ee42 git-gui: Restore ability to Stage Working Copy for conflicts. ... Tools like rerere leave files marked as conflicts in the index, while actually resolving them in the working copy. Also, some people like to use an external editor to resolve conflicts. This patch restores functionality previously removed in commit 617ceee653 by adding a new context menu item. It still ensures that the user does not stage conflicting files accidentally by clicking on the icon instead of the name. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <sop@google.com>		2008-09-12 08:09:09 -07:00
lib	git-gui: Restore ability to Stage Working Copy for conflicts.	2008-09-12 08:09:09 -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: Fix string escaping in po2msg.sh	2008-09-01 15:39:11 -07:00
windows	git-gui (Windows): Change wrapper to execdir 'libexec/git-core'	2008-07-29 22:43:37 -07:00
.gitignore	git-gui: Honor a config.mak in git-gui's top level	2007-10-13 22:14:14 -04: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
git-gui.sh	git-gui: Restore ability to Stage Working Copy for conflicts.	2008-09-12 08:09:09 -07:00