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