summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)AuthorFilesLines
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2011-02-14correct type of EMPTY_TREE_SHA1_BINLibravatar Jonathan Nieder1-1/+1
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+7
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-1/+10
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-1/+70
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-5/+161
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-1/+31
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-3/+322
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland1-0/+27
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+120