| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 2010-11-17 |
| * | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 2010-11-17 |
| * | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 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 | 2010-11-17 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/notes-merge.h