Skip to content

Cherry Picking for staging branches

Jump to bottom
Marco Ceppi edited this page Mar 24, 2017 · 1 revision 
git clone [email protected]:juju-solutions/kubernetes.git
git checkout -b 9.9-staging origin/9.9-staging

Add the repo which has commits to be cherry-pick'd

git remote add user https://github.com/user/kubernetes.git
git fetch user

You now have all user refs.

git log user/branch

This will present a log of commits, find the commit hashes you want

commit 71f583ebe49b675964ff2471e449cd76e0275e2a
Author: User <[email protected]>
Date:   Thu Mar 23 16:14:02 2017 -0500

    Commit

commit 03aba86974957feae11a73a0db43a39b5743c550
Merge: 5d7ff2a 2ed83e1
Author: Kubernetes Submit Queue <[email protected]>
Date:   Thu Mar 23 12:45:38 2017 -0700

    ...

Cherry pick the commits, 71f583ebe49b675964ff2471e449cd76e0275e2a to the 9.9-staging branch

git cherry-pick 71f583e

In the event of more than one commit, replay them in chronological order

git log user/branch

Find the commit hashes

commit 71f583ebe49b675964ff2471e449cd76e0275e2a
Author: User <[email protected]>
Date:   Thu Mar 23 16:14:02 2017 -0500

    Commit #2

commit 5d7ff2a16bd8e6bef51f4b91b5067ffa899aa801
Author: User <[email protected]>
Date:   Thu Mar 23 16:12:02 2017 -0500

    Commit #1

commit 03aba86974957feae11a73a0db43a39b5743c550
Merge: 5d7ff2a 2ed83e1
Author: Kubernetes Submit Queue <[email protected]>
Date:   Thu Mar 23 12:45:38 2017 -0700

    ...

Cherry pick the commits, to the 9.9-staging branch

git cherry-pick 5d7ff2 71f583e
Clone this wiki locally