Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Keller <jacob.keller@gmail.com>2015-08-18 00:33:31 +0300
committerJunio C Hamano <gitster@pobox.com>2015-08-18 01:38:32 +0300
commit93efcad31777142840eaefc19b71d1a4b6a2fe24 (patch)
tree079224bbe9ff6a56888bc15f500053b1744febed /notes-utils.h
parent4d03dd18f0860d4052fab5ce7779e4bba302e5fc (diff)
notes: extract parse_notes_merge_strategy to notes-utils
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/notes-utils.h b/notes-utils.h
index db5811e3f7..fa538e1d95 100644
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -37,6 +37,7 @@ struct notes_rewrite_cfg {
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);