Re: cherry-picking fails after making a directory a submodule

2018-01-08 Thread Per Cederqvist
On Mon, Jan 8, 2018 at 10:46 PM, Stefan Beller wrote: > On Mon, Jan 8, 2018 at 1:08 PM, Per Cederqvist wrote: >> I have a situation where I have switched a directory from being a >> subdirectory to being a submodule. I then try to cherry-pick a commit >>

Re: cherry-picking fails after making a directory a submodule

2018-01-08 Thread Stefan Beller
On Mon, Jan 8, 2018 at 1:08 PM, Per Cederqvist wrote: > I have a situation where I have switched a directory from being a > subdirectory to being a submodule. I then try to cherry-pick a commit > from a taskbranch that was made before the switch to the master > branch. The

cherry-picking fails after making a directory a submodule

2018-01-08 Thread Per Cederqvist
I have a situation where I have switched a directory from being a subdirectory to being a submodule. I then try to cherry-pick a commit from a taskbranch that was made before the switch to the master branch. The commit touches a file outside the subdirectory/submodule. Yet "git cherry-pick"