summaryrefslogtreecommitdiff
path: root/notes-merge.h
AgeCommit message (Expand)Author
2018-11-12notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-15Add missing includes and forward declarationsElijah Newren
2017-06-05notes-merge: convert notes_merge* to struct object_idBrandon Williams
2015-08-17notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland