Created
April 25, 2015 23:19
-
-
Save kalenjohnson/9ed257d8afb81e571a4b to your computer and use it in GitHub Desktop.
Cherry pick upstream to subdirectory
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git cherry-pick -Xsubtree=<subdirectory> 517be2a88318de51f51397066575ab07fae825a1 --strategy=recursive -X <theirs> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment