diff options
| author | Graydon, Tracy <tracy.graydon@intel.com> | 2013-01-31 17:08:15 -0800 |
|---|---|---|
| committer | Graydon, Tracy <tracy.graydon@intel.com> | 2013-01-31 17:08:15 -0800 |
| commit | 699fc9f67a9a62df492d1cd049e4978953640de9 (patch) | |
| tree | f0c16f1494bd71922e7bf5258037427cac4a350b /rerere.h | |
| download | git-699fc9f67a9a62df492d1cd049e4978953640de9.tar.gz git-699fc9f67a9a62df492d1cd049e4978953640de9.tar.bz2 git-699fc9f67a9a62df492d1cd049e4978953640de9.zip | |
Initial commit for TizenHEADsubmit/2.0alpha/20130201.014617accepted/2.0alpha/20130201.0121062.0alpha
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/rerere.h b/rerere.h new file mode 100644 index 0000000..eaa9004 --- /dev/null +++ b/rerere.h @@ -0,0 +1,18 @@ +#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); +extern int rerere_forget(const char **); + +#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ + "update the index with reused conflict resolution if possible") + +#endif |