diff options
| author | Jacob Keller <jacob.keller@gmail.com> | 2015-08-17 14:33:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:36:23 -0700 |
| commit | 4d03dd18f0860d4052fab5ce7779e4bba302e5fc (patch) | |
| tree | f27054d4b2ef3831bbb9975e001e00beb99016b7 /notes-utils.h | |
| parent | e48ad1b9b1d862dd0aad3a21c7e6ca5ec68c024c (diff) | |
| download | git-4d03dd18f0860d4052fab5ce7779e4bba302e5fc.tar.gz | |
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-utils.h')
| -rw-r--r-- | notes-utils.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/notes-utils.h b/notes-utils.h index 890ddb33e1..db5811e3f7 100644 --- a/notes-utils.h +++ b/notes-utils.h @@ -19,6 +19,14 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents, void commit_notes(struct notes_tree *t, const char *msg); +enum notes_merge_strategy { + NOTES_MERGE_RESOLVE_MANUAL = 0, + NOTES_MERGE_RESOLVE_OURS, + NOTES_MERGE_RESOLVE_THEIRS, + NOTES_MERGE_RESOLVE_UNION, + NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ +}; + struct notes_rewrite_cfg { struct notes_tree **trees; const char *cmd; |