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