diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
| commit | 43efcf42382e87de4aa423e5e1607958ad1717d0 (patch) | |
| tree | 7e19a0765b0dd6885fbdf69d3a8d0159a1b42de8 /notes-merge.h | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | c7fd06b6411fb04eb4d9acd7f8822a288a50dc17 (diff) | |
| download | git-43efcf42382e87de4aa423e5e1607958ad1717d0.tar.gz | |
Merge branch 'baserock/jonathanmaw/S9007/upgrade-git' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'notes-merge.h')
| -rw-r--r-- | notes-merge.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/notes-merge.h b/notes-merge.h index 0c11b173a1..1d01f6aacf 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -26,20 +26,6 @@ struct notes_merge_options { void init_notes_merge_options(struct notes_merge_options *o); /* - * Create new notes commit from the given notes tree - * - * Properties of the created commit: - * - tree: the result of converting t to a tree object with write_notes_tree(). - * - parents: the given parents OR (if NULL) the commit referenced by t->ref. - * - author/committer: the default determined by commmit_tree(). - * - commit message: msg - * - * The resulting commit SHA1 is stored in result_sha1. - */ -void create_notes_commit(struct notes_tree *t, struct commit_list *parents, - const struct strbuf *msg, unsigned char *result_sha1); - -/* * Merge notes from o->remote_ref into o->local_ref * * The given notes_tree 'local_tree' must be the notes_tree referenced by the |