Skip to main content

Browse the archive

https://github.com/git/git
30 May 2024, 06:26:10 UTC
Revision d3fae2a076c42da510f5ee3dfba138fb7da0d151 authored by Rafael Hovhannisyan on 09 July 2014, 23:04:49 UTC, committed by Rafael Hovhannisyan on 09 July 2014, 23:04:49 UTC 
Update gettext.c
1 parent 81e776d
Raw File
Tip revision: d3fae2a076c42da510f5ee3dfba138fb7da0d151 authored by Rafael Hovhannisyan on 09 July 2014, 23:04:49 UTC
Update gettext.c
Tip revision: d3fae2a
rerere.h 
#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

struct pathspec;

#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 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")

#endif
back to top