Cherry Pick a Squashed Commit

Question

I have two main branches, staging and master. I have a few commits and I have pushed those changes to a branch say xyz whose base branch is staging and have created a pull request for staging branch. All these commits has been squashed into a single commit.

Is it possible to cherry pick this squashed commit and apply this cherry pick to a new branch started from master, so that I can create the same pull request to master branch also.

Yes, sounds perfectly reasonable. What makes you believe it's not? — kowsky, Mar 06 '18 at 15:55
as long as you have the hash of the commit, you can cherry-pick it. — Schleis, Mar 06 '18 at 16:18

score 6 · Accepted Answer · answered Mar 07 '18 at 09:59

6

Is it possible to cherry pick this squashed commit and apply this cherry pick to a new branch started from master

Yes: git cherry-pick <sha of squashed commit>

answered Mar 07 '18 at 09:59

Philip Pittle

11,821
8
59
123

I see that squashed commits also have parents so this solution doesn't seem to work for me. – user1870400 Aug 11 '18 at 18:24
@user1870400 - you can cherry pick multiple commits, but you'll need to run `cherry-pick` for each commit you want moved, one at a time, and in the order you want them applied (generally oldest first) – Philip Pittle Aug 13 '18 at 08:23

Cherry Pick a Squashed Commit

1 Answers1