diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-25 15:51:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 18:10:36 -0800 |
| commit | dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 (patch) | |
| tree | bdcd9bf016f18206cb361aebb644e6ea9fe9c718 /builtin-rerere.c | |
| parent | 27d6b08536838fff0e3568a57cc622ca1c39bf01 (diff) | |
| download | git-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.gz git-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.xz | |
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 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 2be9ffb77..0253abf9b 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -110,6 +110,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) if (!strcmp(argv[1], "-h")) usage(git_rerere_usage); + else if (!strcmp(argv[1], "forget")) + return rerere_forget(argv + 2); fd = setup_rerere(&merge_rr); if (fd < 0) |