Staging
v0.5.1
v0.5.1
Revision 49ed2bc4660c7cd0592cf21cc514080574d06320 authored by Junio C Hamano on 05 December 2006, 03:44:40 UTC, committed by Junio C Hamano on 06 December 2006, 18:47:14 UTC
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
1 parent 0fb1eaa
File | Mode | Size |
---|---|---|
.gitignore | -rw-r--r-- | 34 bytes |
Git.pm | -rw-r--r-- | 21.6 KB |
Makefile.PL | -rw-r--r-- | 563 bytes |
private-Error.pm | -rw-r--r-- | 18.6 KB |
Computing file changes ...