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 |
|---|---|---|
| test | ||
| README | -rw-r--r-- | 3.1 KB |
| git-favicon.png | -rw-r--r-- | 164 bytes |
| git-logo.png | -rw-r--r-- | 208 bytes |
| gitweb.css | -rw-r--r-- | 6.2 KB |
| gitweb.perl | -rwxr-xr-x | 119.6 KB |
Computing file changes ...
