rerere.h

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