summaryrefslogtreecommitdiffstats
path: root/t/t3309-notes-merge-auto-resolve.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* config: fix leaking "core.notesref" variablePatrick Steinhardt2024-06-111-0/+1
* config tests: cover blind spots in git_die_config() testsÆvar Arnfjörð Bjarmason2023-03-281-1/+6
* t3309: make test work with SHA-256brian m. carlson2020-02-071-84/+144
* notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-181-0/+39
* notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-181-0/+40
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+145
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-0/+502