Age | Commit message (Expand) | Author |
---|---|---|
2015-08-18 | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller |
2015-08-18 | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller |
2010-11-18 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland |
2010-11-18 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland |