13 Commits (39f73315454d2553b2d3219a58f5110a60eba5a1)

Author SHA1 Message Date
Elijah Newren ef3ca95475 Add missing includes and forward declarations 6 years ago
Brandon Williams 5237e0eb59 notes-merge: convert notes_merge* to struct object_id 8 years ago
Jacob Keller 4d03dd18f0 notes: extract enum notes_merge_strategy to notes-utils.h 10 years ago
Johan Herland bf9a05ba46 Move create_notes_commit() from notes-merge.c into notes-utils.c 12 years ago
Nguyễn Thái Ngọc Duy 13f8b72d8c Convert commit_tree() to take strbuf as message 13 years ago
Johan Herland a6a09095a0 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" 14 years ago
Johan Herland 443259cf92 git notes merge: List conflicting notes in notes merge commit message 14 years ago
Johan Herland 6abb3655ef git notes merge: Manual conflict resolution, part 2/2 14 years ago
Johan Herland 809f38c8ab git notes merge: Manual conflict resolution, part 1/2 14 years ago
Johan Herland 3228e67120 git notes merge: Add automatic conflict resolvers (ours, theirs, union) 14 years ago
Johan Herland 2085b16aef git notes merge: Handle real, non-conflicting notes merges 14 years ago
Johan Herland 56881843d4 builtin/notes.c: Refactor creation of notes commits. 14 years ago
Johan Herland 75ef3f4a5c git notes merge: Initial implementation handling trivial merges only 14 years ago