summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
Diffstat (limited to 'rerere.h')
-rw-r--r--rerere.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/rerere.h b/rerere.h
index c2961feaaa..5e5a312e4c 100644
--- a/rerere.h
+++ b/rerere.h
@@ -37,6 +37,7 @@ 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"))
+ N_("update the index with reused conflict resolution if possible"), \
+ PARSE_OPT_NOCOMPLETE)
#endif