averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Teach --[no-]rerere-autoupdate option to merge, revert and friends

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2009-12-04 00:20:48 -08:00
parent 1a56be134f
commit cb6020bb01
12 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rerere.h
View File

@@ -3,9 +3,15 @@
#include "string-list.h"
extern int setup_rerere(struct string_list *);
extern int rerere(void);
#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