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>
Alexander Gavrilov committed
Sep 8, 2008 at 20:37 UTC
2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
2 files changed
+11
git-gui.sh
+5
@@ -2902,6 +2902,11 @@ $ctxmmg add command \
2902
-command {merge_resolve_one 1}
2903
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2904
$ctxmmg add separator
2905
+$ctxmmg add command \
2906
+ -label [mc "Stage Working Copy"] \
2907
+ -command {merge_resolve_one 0}
2908
+lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2909
+$ctxmmg add separator
2910
create_common_diff_popup $ctxmmg
2911
2912
proc popup_diff_menu {ctxm ctxmmg x y X Y} {
lib/mergetool.tcl
+6
@@ -5,6 +5,12 @@ proc merge_resolve_one {stage} {
5
global current_diff_path
6
7
switch -- $stage {
8
+ 0 { # Stage without confirmation, to minimize
9
+ # disruption of the rerere workflow
10
+ merge_add_resolution $current_diff_path
11
+ return
12
+ }
13
+
14
1 { set target [mc "the base version"] }
15
2 { set target [mc "this branch"] }
16
3 { set target [mc "the other branch"] }