Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/sequencer-in-process-commit' | Junio C Hamano | 2018-02-13 | 1 | -1/+0 |
|\ | |||||
| * | t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 | Phillip Wood | 2017-11-24 | 1 | -1/+0 |
* | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-way | Elijah Newren | 2017-11-15 | 1 | -1/+1 |
* | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 | 1 | -0/+36 |
|/ | |||||
* | cherry-pick: add t3512 for submodule updates | Jens Lehmann | 2014-07-14 | 1 | -0/+13 |