summaryrefslogtreecommitdiff
path: root/notes-merge.h
AgeCommit message (Expand)AuthorFilesLines
2018-08-15Add missing includes and forward declarationsLibravatar Elijah Newren1-0/+4
2017-06-05notes-merge: convert notes_merge* to struct object_idLibravatar Brandon Williams1-10/+10
2015-08-17notes: extract enum notes_merge_strategy to notes-utils.hLibravatar Jacob Keller1-7/+3
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cLibravatar Johan Herland1-14/+0
2011-12-15Convert commit_tree() to take strbuf as messageLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-1/+2
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+1
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-0/+23
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-1/+10
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-0/+6
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-3/+12
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-0/+14
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+36