Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 406da7803217998ff6bf5dc69c55b1613556c2f4 authored by Junio C Hamano on 02 December 2011, 17:31:32 UTC, committed by Junio C Hamano on 02 December 2011, 18:02:52 UTC 
Git 1.7.8
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fc14b89
Raw File
Tip revision: 406da7803217998ff6bf5dc69c55b1613556c2f4 authored by Junio C Hamano on 02 December 2011, 17:31:32 UTC
Git 1.7.8
Tip revision: 406da78
rerere.h 
#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

#define RERERE_AUTOUPDATE   01
#define RERERE_NOAUTOUPDATE 02

/*
 * 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;

extern int setup_rerere(struct string_list *, int);
extern int rerere(int);
extern const char *rerere_path(const char *hex, const char *file);
extern int has_rerere_resolution(const char *hex);
extern int rerere_forget(const char **);
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")

#endif
back to top