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