Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision 5329c99795e187b36a527baa883efe5c3dc2f98c authored by Junio C Hamano on 16 August 2011, 18:41:26 UTC, committed by Junio C Hamano on 16 August 2011, 18:41:26 UTC 
Merge branch 'jn/mime-type-with-params' into maint
 
* jn/mime-type-with-params:
  gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
  gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
2 parent s 4a5a800 + e8c3531
Raw File
Tip revision: 5329c99795e187b36a527baa883efe5c3dc2f98c authored by Junio C Hamano on 16 August 2011, 18:41:26 UTC
Merge branch 'jn/mime-type-with-params' into maint
Tip revision: 5329c99
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