diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 08:20:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 08:20:48 (GMT) |
| commit | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (patch) | |
| tree | e03a7afb1884d2b4f8f1e45ee6a945baebd95806 /rerere.h | |
| parent | 1a56be134f9477296a7ade040e8b802bf3a643a1 (diff) | |
| download | git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.zip git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.gz git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.bz2 | |
Teach --[no-]rerere-autoupdate option to merge, revert and friends
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>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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 |