[OE-core] using devtool for rebasing patches
Alexander Kanavin
alexander.kanavin at linux.intel.com
Thu Nov 3 16:35:05 UTC 2016
On 11/03/2016 06:29 PM, Christopher Larson wrote:
> git already provides such a UI, afaik devtool just needs to use git-am
> to apply the patches, ideally passing -3 to it, and let the user use git
> am to resolve and continue applying patches.
I don't think git am has any UI that helps with rebasing the rejects,
and -3 is often not useful here, as we don't have the commit history, if
the source is coming from tarball.
What you need to do here is to use git am --reject, which would
partially apply the patch, then find all the *.rej files and let the
user manually edit them in, then complete the patch application with git
am --continue.
Alex
More information about the Openembedded-core
mailing list