Andrew's git - gitweb.git/blob

   1#ifndef RERERE_H
   2#define RERERE_H
   3
   4#include "string-list.h"
   5
   6struct 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 */
  16extern void *RERERE_RESOLVED;
  17
  18struct rerere_id {
  19        char hex[41];
  20};
  21
  22extern int setup_rerere(struct string_list *, int);
  23extern 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 */
  30extern const char *rerere_path(const struct rerere_id *, const char *file);
  31extern int rerere_forget(struct pathspec *);
  32extern int rerere_remaining(struct string_list *);
  33extern void rerere_clear(struct string_list *);
  34extern 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