| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 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 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |