Looking for patch rebasing advice
ghudson at mit.edu
Thu Jul 28 14:01:57 EDT 2016
On 07/28/2016 01:19 PM, Will Fiveash wrote:
> $ git checkout -b krb5-1.14.2 krb5-1.14.2-final
> 2. With krb5-1.14.2 as the checked out branch do a git apply and git
> commit -a for each patch to be rebased so there is a separate commit
> in this branch for each patch.
> At this point it's unclear to me as to whether I need to create another
> branch based on the krb5-1.14.3-final tag and what command I should use
> to rebase the patches.
You probably do want to create another branch. The following should
create a krb5-1.14.3 branch and copy all of the downstream commits you
made on the krb5-1.14.2 branch:
git checkout -b krb5-1.14.3 krb5-1.14.3-final
git cherry-pick krb5-1.14.2-final..krb5-1.14.2
This isn't a "rebase" operation since you're copying the commits, not
modifying an existing branch.
(You might consider naming the downstream branches more explicitly, like
krb5-1.14.2-oracle, but that's up to you.)
More information about the krbdev