Hi, This is the 5th iteration of the 'git notes merge' patch series. In short, patch #5 has an updated commit message, patch #6 has a minor improvement, patch #16 has renames "--reset" to "--abort", and there are 2 new patches at the end (totally independent from the other patches) implementing 'git merge --abort'. Feel free to consider the two last patches separately from the rest of the series. Changes between v4 and v5: - (Jonathan Nieder) Improved commit messages - (Jonathan Nieder) Improve clarity of final if-condition in note_tree_insert() - (Sverre Rabbelier) Rename 'git notes merge --reset' to 'git notes merge --abort'. - Introduce 'git merge --abort' as a synonym of 'git reset --merge' (when MERGE_HEAD is present). Some open questions (not already being discussed in other threads): - Should we refuse to finalize a notes merge when conflict markers present in .git/NOTES_MERGE_WORKTREE? Since add/commit in regular merges does NOT do this, I have not implemented it for notes merge. Have fun! :) ...Johan Johan Herland (23): notes.c: Hexify SHA1 in die() message from init_notes() (trivial) notes.h: Minor documentation fixes to copy_notes() notes.h: Make default_notes_ref() available in notes API notes.c: Reorder functions in preparation for next commit notes.h/c: Allow combine_notes functions to remove notes notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond (trivial) t3303: Indent with tabs instead of spaces for consistency notes.c: Use two newlines (instead of one) when concatenating notes builtin/notes.c: Split notes ref DWIMmery into a separate function git notes merge: Initial implementation handling trivial merges only builtin/notes.c: Refactor creation of notes commits. git notes merge: Handle real, non-conflicting notes merges git notes merge: Add automatic conflict resolvers (ours, theirs, union) Documentation: Preliminary docs on 'git notes merge' git notes merge: Manual conflict resolution, part 1/2 git notes merge: Manual conflict resolution, part 2/2 git notes merge: List conflicting notes in notes merge commit message git notes merge: --commit should fail if underlying notes ref has moved git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" git notes merge: Add testcases for merging notes trees at different fanouts Provide 'git notes get-ref' to easily retrieve current notes ref cmd_merge(): Parse options before checking MERGE_HEAD Provide 'git merge --abort' as a synonym to 'git reset --merge' Documentation/git-merge.txt | 29 ++- Documentation/git-notes.txt | 85 ++++- Makefile | 2 + builtin.h | 2 +- builtin/merge.c | 47 ++- builtin/notes.c | 268 +++++++++++-- notes-cache.c | 3 +- notes-merge.c | 735 +++++++++++++++++++++++++++++++++ notes-merge.h | 98 +++++ notes.c | 272 ++++++++---- notes.h | 47 ++- t/t3301-notes.sh | 23 + t/t3303-notes-subtrees.sh | 19 +- t/t3308-notes-merge.sh | 368 +++++++++++++++++ t/t3309-notes-merge-auto-resolve.sh | 647 +++++++++++++++++++++++++++++ t/t3310-notes-merge-manual-resolve.sh | 556 +++++++++++++++++++++++++ t/t3311-notes-merge-fanout.sh | 436 +++++++++++++++++++ t/t3404-rebase-interactive.sh | 1 + t/t7609-merge-abort.sh | 273 ++++++++++++ t/t9301-fast-import-notes.sh | 5 + 20 files changed, 3754 insertions(+), 162 deletions(-) create mode 100644 notes-merge.c create mode 100644 notes-merge.h create mode 100755 t/t3308-notes-merge.sh create mode 100755 t/t3309-notes-merge-auto-resolve.sh create mode 100755 t/t3310-notes-merge-manual-resolve.sh create mode 100755 t/t3311-notes-merge-fanout.sh create mode 100755 t/t7609-merge-abort.sh -- 1.7.3.98.g5ad7d9 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html