diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
| commit | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch) | |
| tree | 77d37de207313b760eb08c502be1ea98a18351e9 /builtin-rerere.c | |
| parent | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' (diff) | |
| parent | Teach --[no-]rerere-autoupdate option to merge, revert and friends (diff) | |
| download | tgif-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.xz | |
Merge branch 'jc/rerere'
* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 2be9ffb77b..5028138898 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -103,15 +103,24 @@ static int diff_two(const char *file1, const char *label1, int cmd_rerere(int argc, const char **argv, const char *prefix) { struct string_list merge_rr = { NULL, 0, 0, 1 }; - int i, fd; - + int i, fd, flags = 0; + + if (2 < argc) { + if (!strcmp(argv[1], "-h")) + usage(git_rerere_usage); + if (!strcmp(argv[1], "--rerere-autoupdate")) + flags = RERERE_AUTOUPDATE; + else if (!strcmp(argv[1], "--no-rerere-autoupdate")) + flags = RERERE_NOAUTOUPDATE; + if (flags) { + argc--; + argv++; + } + } if (argc < 2) - return rerere(); - - if (!strcmp(argv[1], "-h")) - usage(git_rerere_usage); + return rerere(flags); - fd = setup_rerere(&merge_rr); + fd = setup_rerere(&merge_rr, flags); if (fd < 0) return 0; |