| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 | 1 | -1/+1 |
| * | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 2010-11-17 | 1 | -0/+23 |
| * | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 2010-11-17 | 1 | -1/+10 |
| * | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 2010-11-17 | 1 | -0/+6 |
| * | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -3/+12 |
| * | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 2010-11-17 | 1 | -0/+14 |
| * | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+36 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/notes-merge.h