Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rerere forget path: forget recorded resolution
author
Junio C Hamano
<gitster@pobox.com>
Fri, 25 Dec 2009 23:51:32 +0000
(15:51 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Jan 2010 02:10:36 +0000
(18:10 -0800)
After you find out an earlier resolution you told rerere to use was a
mismerge, there is no easy way to clear it. A new subcommand "forget" can
be used to tell git to forget a recorded resolution, so that you can redo
the merge from scratch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
raw
|
patch
| inline |
side by side
(from:
dea4562
)
No differences found