summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)Author
2011-02-14correct type of EMPTY_TREE_SHA1_BINJonathan Nieder
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