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