@matheusbsbs / matheus-bagliano / commits / 49ed2bc466
Fork 0

git-reset to remove "$GIT_DIR/MERGE_MSG"

An earlier commit a9cb3c6e changed git-commit to use the contents of MERGE_MSG even when we do not have MERGE_HEAD (the rationale is in its log message). However, the change tricks the following sequence to include a merge message in a completely unrelated commit: $ git pull somewhere : oops, the conflicts are too much. forget it. $ git reset --hard : work work work $ git commit To fix this confusion, this patch makes "git reset" to remove the leftover MERGE_MSG that was prepared when the user abandoned the merge. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Luben Tuikov <ltuikov@yahoo.com

Junio C Hamano committed Dec 4, 2006 at 19:44 UTC 49ed2bc4660c7cd0592cf21cc514080574d06320
1 file changed +2 -1
git-reset.sh
+2 -1
@@ -63,6 +63,7 @@ case "$reset_type" in
63 ;;
64 esac
65
66 -rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"
66 +rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
67 + "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
68
69 exit $update_ref_status