summaryrefslogtreecommitdiff
path: root/ws.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-25 23:51:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-11 02:10:36 (GMT)
commitdea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 (patch)
treebdcd9bf016f18206cb361aebb644e6ea9fe9c718 /ws.c
parent27d6b08536838fff0e3568a57cc622ca1c39bf01 (diff)
downloadgit-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.zip
git-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.gz
git-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.bz2
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>
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions