summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* t3[0-3]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-1/+1
* t: remove test_oid_init in testsbrian m. carlson2020-07-301-1/+0
* t3308: make test work with SHA-256brian m. carlson2020-02-071-28/+55
* tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'SZEDER Gábor2018-08-211-1/+1
* 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