summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
Diffstat (limited to 'rerere.h')
-rw-r--r--rerere.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/rerere.h b/rerere.h
index 4aa06c9..1222e91 100644
--- a/rerere.h
+++ b/rerere.h
@@ -7,6 +7,7 @@ struct pathspec;
#define RERERE_AUTOUPDATE 01
#define RERERE_NOAUTOUPDATE 02
+#define RERERE_READONLY 04
/*
* Marks paths that have been hand-resolved and added to the
@@ -15,15 +16,25 @@ struct pathspec;
*/
extern void *RERERE_RESOLVED;
+struct rerere_id {
+ char hex[41];
+};
+
extern int setup_rerere(struct string_list *, int);
extern int rerere(int);
-extern const char *rerere_path(const char *hex, const char *file);
+/*
+ * Given the conflict ID and the name of a "file" used for replaying
+ * the recorded resolution (e.g. "preimage", "postimage"), return the
+ * path to that filesystem entity. With "file" specified with NULL,
+ * return the path to the directory that houses these files.
+ */
+extern const char *rerere_path(const struct rerere_id *, const char *file);
extern int rerere_forget(struct pathspec *);
extern int rerere_remaining(struct string_list *);
extern void rerere_clear(struct string_list *);
extern void rerere_gc(struct string_list *);
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
- "update the index with reused conflict resolution if possible")
+ N_("update the index with reused conflict resolution if possible"))
#endif