Staging
v0.5.1
https://github.com/git/git
Revision 594730e980521310d88006d91f3f14ef5eff1e2b authored by Junio C Hamano on 10 March 2016, 19:13:13 UTC, committed by Junio C Hamano on 10 March 2016, 19:14:08 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2e1e569
Raw File
Tip revision: 594730e980521310d88006d91f3f14ef5eff1e2b authored by Junio C Hamano on 10 March 2016, 19:13:13 UTC
Git 2.7.3
Tip revision: 594730e
rerere.h
#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

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
 * index. Set in the util field of such paths after calling
 * rerere_remaining.
 */
extern void *RERERE_RESOLVED;

struct rerere_id {
	char hex[41];
};

extern int setup_rerere(struct string_list *, int);
extern int rerere(int);
/*
 * 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), \
	N_("update the index with reused conflict resolution if possible"))

#endif
back to top