Skip to content

Instantly share code, notes, and snippets.

@domenic

domenic/.bashrc

Last active September 1, 2015 17:50
Show Gist options
  • Star 11 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save domenic/11371574 to your computer and use it in GitHub Desktop.
Save domenic/11371574 to your computer and use it in GitHub Desktop.
Download ZIP
.bashrc with GitHub PR function
Raw
.bashrc
pr () {
git fetch origin refs/pull/$1/head:refs/remotes/origin/pr/$1 --force
git checkout -b pr/$1 origin/pr/$1
git rebase master
git checkout master
git merge pr/$1 --ff-only
}
@domenic
Copy link
Author

domenic commented Sep 1, 2015

For merging your own PRs, or in general any PR that uses a branch on the main repo instead of a fork, you can try:

mypr () {
  git checkout $1
  git rebase master
  git push origin $1 --force
  git checkout master
  git merge $1 --ff-only
}

Usage:

$ mypr selectors-attribute-values # rebases, force-pushes to update origin version, and merges to local master
$ git push # pushes local master to origin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment