Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2017-11-15 | merge-recursive: handle addition of submodule on our side of history | Elijah Newren | 1 | -1/+1 |
2017-11-12 | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 1 | -0/+36 |
2014-07-14 | cherry-pick: add t3512 for submodule updates | Jens Lehmann | 1 | -0/+13 |