summaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAgeFilesLines
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-3/+322
* builtin/notes.c: Refactor creation of notes commits.Johan Herland2010-11-171-0/+27
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+120