diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:44:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:46:35 -0800 |
| commit | 6751e0471df1bdc4a1d5e5a3929a531c74e95aeb (patch) | |
| tree | 4f25445b5ceb6f83473f60a36c7d09d2e1f0378e /builtin-rerere.c | |
| parent | 030b1a77f72a7e3307c7d7881ae570ca1c8ed877 (diff) | |
| parent | dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 (diff) | |
| download | git-6751e0471df1bdc4a1d5e5a3929a531c74e95aeb.tar.gz | |
Merge branch 'jc/cache-unmerge'
* jc/cache-unmerge:
rerere forget path: forget recorded resolution
rerere: refactor rerere logic to make it independent from I/O
rerere: remove silly 1024-byte line limit
resolve-undo: teach "update-index --unresolve" to use resolve-undo info
resolve-undo: "checkout -m path" uses resolve-undo information
resolve-undo: allow plumbing to clear the information
resolve-undo: basic tests
resolve-undo: record resolved conflicts in a new index extension section
builtin-merge.c: use standard active_cache macros
Conflicts:
builtin-ls-files.c
builtin-merge.c
builtin-rerere.c
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 5028138898..25f507a2f1 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -120,6 +120,9 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) if (argc < 2) return rerere(flags); + if (!strcmp(argv[1], "forget")) + return rerere_forget(argv + 2); + fd = setup_rerere(&merge_rr, flags); if (fd < 0) return 0; |