Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision cee0c2750bb5f1b38f15ef961517e03c2e39c9ec authored by Junio C Hamano on 18 March 2014, 21:06:49 UTC, committed by Junio C Hamano on 18 March 2014, 21:16:16 UTC 
Git 1.9.1
 
The version numbering scheme has changed since Git 1.9 and we
dropped the third dewey-decimal from the traditional numbering
(e.g. both 1.8.4 and 1.8.5 were major feature releases).  This
release 1.9.1 is the first maintenance relase for Git 1.9.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9526473
Raw File
Tip revision: cee0c2750bb5f1b38f15ef961517e03c2e39c9ec authored by Junio C Hamano on 18 March 2014, 21:06:49 UTC
Git 1.9.1
Tip revision: cee0c27
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