mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach --[no-]rerere-autoupdate option to merge, revert and friends

Browse Source 
Introduce a command line option to override rerere.autoupdate configuration
variable to make it more useful.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2009-12-04 00:20:48 -08:00
parent 1a56be134f
commit cb6020bb01
12 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin-rerere.c
View File

@ -101,15 +101,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();
return rerere(flags);
if (!strcmp(argv[1], "-h"))
usage(git_rerere_usage);
fd = setup_rerere(&merge_rr);
fd = setup_rerere(&merge_rr, flags);
if (fd < 0)
return 0;