diff options
| author | Jacob Keller <jacob.keller@gmail.com> | 2015-08-17 21:33:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-17 22:36:23 (GMT) |
| commit | 4d03dd18f0860d4052fab5ce7779e4bba302e5fc (patch) | |
| tree | f27054d4b2ef3831bbb9975e001e00beb99016b7 /notes-merge.h | |
| parent | e48ad1b9b1d862dd0aad3a21c7e6ca5ec68c024c (diff) | |
| download | git-4d03dd18f0860d4052fab5ce7779e4bba302e5fc.zip git-4d03dd18f0860d4052fab5ce7779e4bba302e5fc.tar.gz git-4d03dd18f0860d4052fab5ce7779e4bba302e5fc.tar.bz2 | |
notes: extract enum notes_merge_strategy to notes-utils.h
A future patch will extract parsing of the --strategy string into a
helper function in notes.c and will require the enumeration definition.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
| -rw-r--r-- | notes-merge.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/notes-merge.h b/notes-merge.h index 1d01f6a..0d89056 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -1,6 +1,8 @@ #ifndef NOTES_MERGE_H #define NOTES_MERGE_H +#include "notes-utils.h" + #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE" enum notes_merge_verbosity { @@ -13,13 +15,7 @@ struct notes_merge_options { const char *remote_ref; struct strbuf commit_msg; int verbosity; - enum { - NOTES_MERGE_RESOLVE_MANUAL = 0, - NOTES_MERGE_RESOLVE_OURS, - NOTES_MERGE_RESOLVE_THEIRS, - NOTES_MERGE_RESOLVE_UNION, - NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ - } strategy; + enum notes_merge_strategy strategy; unsigned has_worktree:1; }; |