mirror of
https://github.com/git/git.git
synced 2024-06-02 18:46:15 +02:00
cb6020bb01
Introduce a command line option to override rerere.autoupdate configuration variable to make it more useful. Signed-off-by: Junio C Hamano <gitster@pobox.com>
18 lines
464 B
C
18 lines
464 B
C
#ifndef RERERE_H
|
|
#define RERERE_H
|
|
|
|
#include "string-list.h"
|
|
|
|
#define RERERE_AUTOUPDATE 01
|
|
#define RERERE_NOAUTOUPDATE 02
|
|
|
|
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);
|
|
|
|
#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
|
|
"update the index with reused conflict resolution if possible")
|
|
|
|
#endif
|