Skip to main content

Browse the archive

Revision 360f852d249f365009b63cab70b50d6f5b5c65e7 authored by Junio C Hamano on 08 April 2014, 19:07:06 UTC, committed by Junio C Hamano on 08 April 2014, 19:07:06 UTC 
Merge branch 'mm/status-porcelain-format-i18n-fix' into maint
 
* mm/status-porcelain-format-i18n-fix:
  status: disable translation when --porcelain is used
2 parent s 86b4c16 + 7a76c28
Raw File
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