Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhere | Jacob Keller | 2016-01-17 | 1 | -11/+11 |
* | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -0/+188 |
* | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+180 |