summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* t3308: create a real ref directory/file conflictJeff King2017-10-071-1/+1
* notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-171-11/+11
* git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-0/+188
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+180