Created
April 19, 2017 09:09
-
-
Save codingthat/f3bed02daeea33aed0d519070e2355c2 to your computer and use it in GitHub Desktop.
Quick merge of upstream pull request
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 clone (my fork url here) | |
cd (repo name here) | |
git remote add (upstream url here) | |
pr() { git fetch upstream pull/$1/head:pr$1 && git merge --commit pr$1; } | |
# now you're set. Pick your PRs, say 1, 2, and 55: | |
pr 1 # fetch, merge, and autocommit upstream's Pull Request #1 | |
pr 2 # same for PR #2 | |
pr 55 # etc. | |
# ... | |
# Assuming you had no merge conflicts (or sorted them out) and have rebased if you wanted to squash: | |
git push # push the changes to your fork |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment