| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | t3308: create a real ref directory/file conflict | Jeff King | 2017-10-07 |
| * | notes: allow merging from arbitrary references | Jacob Keller | 2016-01-17 |
| * | git notes merge: Handle real, non-conflicting notes merges | 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 |