rerere.h

   1 #ifndef RERERE_H
   2 #define RERERE_H
   3
   4 #include "string-list.h"
   5
   6 struct pathspec;
   7
   8 #define RERERE_AUTOUPDATE   01
   9 #define RERERE_NOAUTOUPDATE 02
  10 #define RERERE_READONLY     04
  11
  12 /*
  13  * Marks paths that have been hand-resolved and added to the
  14  * index. Set in the util field of such paths after calling
  15  * rerere_remaining.
  16  */
  17 extern void *RERERE_RESOLVED;
  18
  19 extern int setup_rerere(struct string_list *, int);
  20 extern int rerere(int);
  21 extern const char *rerere_path(const char *hex, const char *file);
  22 extern int rerere_forget(struct pathspec *);
  23 extern int rerere_remaining(struct string_list *);
  24 extern void rerere_clear(struct string_list *);
  25 extern void rerere_gc(struct string_list *);
  26
  27 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
  28         N_("update the index with reused conflict resolution if possible"))
  29
  30 #endif