Commit message (Expand) | Author | Age | |
---|---|---|---|
* | notes: allow merging from arbitrary references | Jacob Keller | 2016-01-17 |
* | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 |
* | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 |