Managing openbmc with subtree

[Brad Bishop]

> On Jul 20, 2018, at 1:43 PM, Brad Bishop <bradleyb at fuzziesquirrel.com> wrote:
>> On Jul 19, 2018, at 4:08 PM, Dave Cobbley <david.j.cobbley at linux.intel.com> wrote:
>> 
>> However at this point, I end up with two commits in the parent repo, one with the squashed changes, and a merge commit.
>> I don't know how to do this operation without ending up with a merge commit, do you have any advice here?
> 
> To avoid the merge you can skip the subtree pull (which does a merge) and
> instead generate a patch:
> 
> git cherry-pick —strategy=subtree -Xsubtree=path/to/subtree <squash-commit>

Oops.  You’ll still have to do the pull and _then_ generate a patch and
discard the merge commit.  Have a look here:

https://github.com/openbmc/openbmc/blob/master/import-layers/HOWTO-update.md