Merge branch 'sb/submodule-update-reset-fix' into maint

diff --git a/diff.c b/diff.c
index fb22b19f09ab13032b0484e64326fef92bb0681f..db4696fdf510d47dd6d235a1c04b8cc550c8e8fe 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -246,7 +246,7 @@ static int parse_ws_error_highlight(const char *arg)
  */
 void init_diff_ui_defaults(void)
 {
-       diff_detect_rename_default = 1;
+       diff_detect_rename_default = DIFF_DETECT_RENAME;
 }
 
 int git_diff_heuristic_config(const char *var, const char *value, void *cb)