OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ah/reflog-typofix-in-error'
[git-core/git.git]
/
notes-utils.h
diff --git
a/notes-utils.h
b/notes-utils.h
index
890ddb3
..
fa538e1
100644
(file)
--- 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);
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;
struct notes_rewrite_cfg {
struct notes_tree **trees;
const char *cmd;
@@
-29,6
+37,7
@@
struct notes_rewrite_cfg {
int mode_from_env;
};
int mode_from_env;
};
+int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj);
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj);