From git Wed Sep 17 11:40:52 2008 From: Johannes Sixt Date: Wed, 17 Sep 2008 11:40:52 +0000 To: git Subject: [PATCH/RFC 2/2] git-gui: Do not automatically stage file after merge tool finishes Message-Id: <1221651652-3712-3-git-send-email-johannes.sixt () telecom ! at> X-MARC-Message: https://marc.info/?l=git&m=122165167515981 If a merge tool was invoked on a conflicted file and the tool completed, then the conflicted file was staged automatically. However, the fact that the user closed the merge tool cannot be understood as the unequivocal sign that the conflict was completely resolved. For example, the user could have decided to postpone the resolution of the conflict, or could have accidentally closed the tool. We better leave the file unstaged and let the user stage it explicitly. Signed-off-by: Johannes Sixt --- lib/mergetool.tcl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 965cfe4..1a96189 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -367,7 +367,5 @@ proc merge_tool_finish {fd} { } delete_temp_files $mtool_tmpfiles - - merge_add_resolution $mtool_target } } -- 1.6.0.1.1210.gb7ffe -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html