| Age | Commit message (Expand) | Author |
|---|---|---|
| 2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland |
| 2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland |
| 2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland |
| 2010-11-17 | builtin/notes.c: Refactor creation of notes commits. | Johan Herland |
| 2010-11-17 | git notes merge: Initial implementation handling trivial merges only | Johan Herland |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |
path: root/notes-merge.c