Created
May 31, 2012 19:48
-
-
Save todb-r7/2845777 to your computer and use it in GitHub Desktop.
How I land pull requests
This file contains 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 checkout master | |
git pull -r | |
git checkout $remote/$branch | |
git rebase master # Ensure it'll merge cleanly | |
git checkout -b Pull$number | |
git diff master # Eyeball the diff locally. | |
git log -1 | grep Author | |
git checkout master | |
git merge --squash Pull432 # Wrap it up into one commit. | |
git commit --author="$author_name_and_email" # Give author credit. | |
# Write the commit message, keep the squashed comments for future historians. | |
git push origin master | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment