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 struct rerere_id {
  20         char hex[41];
  21 };
  22
  23 extern int setup_rerere(struct string_list *, int);
  24 extern int rerere(int);
  25 /*
  26  * Given the conflict ID and the name of a "file" used for replaying
  27  * the recorded resolution (e.g. "preimage", "postimage"), return the
  28  * path to that filesystem entity.  With "file" specified with NULL,
  29  * return the path to the directory that houses these files.
  30  */
  31 extern const char *rerere_path(const struct rerere_id *, const char *file);
  32 extern int rerere_forget(struct pathspec *);
  33 extern int rerere_remaining(struct string_list *);
  34 extern void rerere_clear(struct string_list *);
  35 extern void rerere_gc(struct string_list *);
  36
  37 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
  38         N_("update the index with reused conflict resolution if possible"))
  39
  40 #endif