development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fc/rerere-conflict-style'

Browse source 
* fc/rerere-conflict-style:
  rerere: fix for merge.conflictstyle
This commit is contained in:
Junio C Hamano 2014-06-03 12:06:45 -07:00
parent 520cd9cd20 de3d8bb773
commit 6d3c4e93d4
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/rerere.c
View file

@ -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)