Andrew's git / gitweb.git / rerere.h
?
rerere.hon commit git-am: add am.threeWay config variable (e97a5e7)
   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
  18extern int setup_rerere(struct string_list *, int);
  19extern int rerere(int);
  20extern const char *rerere_path(const char *hex, const char *file);
  21extern int rerere_forget(struct pathspec *);
  22extern int rerere_remaining(struct string_list *);
  23extern void rerere_clear(struct string_list *);
  24extern void rerere_gc(struct string_list *);
  25
  26#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
  27        N_("update the index with reused conflict resolution if possible"))
  28
  29#endif