| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2020-02-07 | t3309: make test work with SHA-256 | brian m. carlson | 1 | -84/+144 |
| 2015-08-17 | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 1 | -0/+39 |
| 2015-08-17 | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 1 | -0/+40 |
| 2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 1 | -0/+145 |
| 2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 1 | -0/+502 |
