Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-11-17 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 1 | -0/+12 |
2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 1 | -0/+176 |
2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 1 | -0/+292 |