Finalize an in-progress git notes merge.
Use this option when you have resolved the conflicts that git notes merge stored in .git/NOTES_MERGE_WORKTREE.
This amends the partial merge commit created by git notes merge (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE.
The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit.
–commit
Take the note message from the given file.
Use - to read the note message from the standard input.
Lines starting with # and empty lines other than a single line between paragraphs will be stripped out.
-F , –file=
Use the given note message (instead of prompting).
If multiple -m options are given, their values are concatenated as separate paragraphs.
Lines starting with # and empty lines other than a single line between paragraphs will be stripped out.
-m , –message=
Manipulate the notes tree in . This overrides GIT_NOTES_REF and the “core.notesRef” configuration.
The ref specifies the full refname when it begins with refs/notes/;
when it begins with notes/, refs/ and otherwise refs/notes/ is prefixed to form a full name of the ref.
–ref
Take the given blob object (for example, another note) as the note message.
(Use git notes copy instead to copy notes between objects.)
-C , –reuse-message=
Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line).
–stdin
When merging notes, resolve notes conflicts using the given strategy.
The following strategies are recognized: “manual” (default), “ours”, “theirs”, “union” and “cat_sort_uniq”.
This option overrides the “notes.mergeStrategy” configuration setting.
See the “NOTES MERGE STRATEGIES” section below for more information on each notes merge strategy.
-s , –strategy=