summaryrefslogtreecommitdiff
path: root/notes-merge.h
Commit message (Expand)AuthorAgeFilesLines
* notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller2015-08-171-7/+3
* Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-121-14/+0
* Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-151-1/+1
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-1/+2
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-1/+1
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-0/+23
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-1/+10
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-0/+6
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-3/+12
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-0/+14
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+36