| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | t3308: create a real ref directory/file conflict | Jeff King | 2017-10-07 | 1 | -1/+1 |
| * | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhere | Jacob Keller | 2016-01-17 | 1 | -11/+11 |
| * | git notes merge: Handle real, non-conflicting notes merges | Johan Herland | 2010-11-17 | 1 | -0/+188 |
| * | git notes merge: Initial implementation handling trivial merges only | Johan Herland | 2010-11-17 | 1 | -0/+180 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |