| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-11-17 | git notes merge: List conflicting notes in notes merge commit message |  Johan Herland | 1 | -1/+10 |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 1 | -1/+70 |
| 2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 1 | -5/+161 |
| 2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 1 | -1/+31 |
| 2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 1 | -3/+322 |
| 2010-11-17 | builtin/notes.c: Refactor creation of notes commits. | Johan Herland | 1 | -0/+27 |
| 2010-11-17 | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 1 | -0/+120 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/notes-merge.c