Merge branch 'en/rev-parse-invalid-range'

diff --git a/rerere.h b/rerere.h
index 5e5a312e4c67979306ea9593bcc68a219272beeb..c2961feaaa8a8297d59fb13b120c1a57c8a2868a 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -37,7 +37,6 @@ extern void rerere_clear(struct string_list *);
 extern void rerere_gc(struct string_list *);
 
 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
-       N_("update the index with reused conflict resolution if possible"), \
-       PARSE_OPT_NOCOMPLETE)
+       N_("update the index with reused conflict resolution if possible"))
 
 #endif