projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 27d6b08) | patch
rerere forget path: forget recorded resolution
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Dec 2009 23:51:32 +0000 (15:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jan 2010 02:10:36 +0000 (18:10 -0800)
commitdea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69
treebdcd9bf016f18206cb361aebb644e6ea9fe9c718tree | snapshot
parent27d6b08536838fff0e3568a57cc622ca1c39bf01commit | diff
rerere forget path: forget recorded resolution

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>
builtin-rerere.c diff | blob | history
rerere.c diff | blob | history
rerere.h diff | blob | history
t/t2030-unresolve-info.sh diff | blob | history
Git—the stupid content tracker