aboutsummaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
Commit message (Expand)AuthorAge
* notes: allow merging from arbitrary referencesJacob Keller2016-01-17
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17