Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fc/rerere-conflict-style' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Jun 2014 18:48:54 +0000
(11:48 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Jun 2014 18:48:54 +0000
(11:48 -0700)
"git rerere forget" did not work well when merge.conflictstyle
was set to a non-default value.
* fc/rerere-conflict-style:
rerere: fix for merge.conflictstyle
builtin/rerere.c
patch
|
blob
|
history
raw
(from parent 1:
5327207
)
diff --git
a/builtin/rerere.c
b/builtin/rerere.c
index 4e51addb3e135465bdb728bb00c5dc3dd53b7c51..98eb8c5404914e4046fdb886866b611351deeacf 100644
(file)
--- a/
builtin/rerere.c
+++ b/
builtin/rerere.c
@@
-60,6
+60,8
@@
int cmd_rerere(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
+ git_config(git_xmerge_config, NULL);
+
if (autoupdate == 1)
flags = RERERE_AUTOUPDATE;
if (autoupdate == 0)