completion: use __gitcomp_builtin in _git_init

diff --git a/rerere.h b/rerere.h
index 1222e91921882b41ac9c1648960eca9305b27d8d..5e5a312e4c67979306ea9593bcc68a219272beeb 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -16,8 +16,10 @@ struct pathspec;
  */
 extern void *RERERE_RESOLVED;
 
+struct rerere_dir;
 struct rerere_id {
-       char hex[41];
+       struct rerere_dir *collection;
+       int variant;
 };
 
 extern int setup_rerere(struct string_list *, int);
@@ -35,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