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

Merge branch 'jc/rerere'

Browse Source 
* jc/rerere:
  Teach --[no-]rerere-autoupdate option to merge, revert and friends
This commit is contained in:
Junio C Hamano
2010-01-18 18:13:01 -08:00
parent 26b9f5cc99 cb6020bb01
commit 4a88fb7ffc
12 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-merge.c
View File

@ -52,6 +52,7 @@ static struct strategy **use_strategies;
static size_t use_strategies_nr, use_strategies_alloc;
static const char *branch;
static int verbosity;
static int allow_rerere_auto;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@ -170,6 +171,7 @@ static struct option builtin_merge_options[] = {
"allow fast-forward (default)"),
OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
"abort if fast-forward is not possible"),
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
"merge strategy to use", option_parse_strategy),
OPT_CALLBACK('m', "message", &merge_msg, "message",
@ -790,7 +792,7 @@ static int suggest_conflicts(void)
}
}
fclose(fp);
rerere();
rerere(allow_rerere_auto);
printf("Automatic merge failed; "
"fix conflicts and then commit the result.\n");
return 1;