Skip to content

Instantly share code, notes, and snippets.

@jeffbcross

jeffbcross/rebase-merge.sh

Created July 28, 2015 16:17
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save jeffbcross/307c6da45d26e29030ef to your computer and use it in GitHub Desktop.
Save jeffbcross/307c6da45d26e29030ef to your computer and use it in GitHub Desktop.
Download ZIP
How angular merges PRs
Raw
rebase-merge.sh
#See fetch_pr script https://gist.github.com/vojtajina/5538170
# fetch and checkout PR branch from "upstream" remote
fetch_pr 123
git fetch upstream
# Replay changes on top of master
git rebase upstream/master
# Replace upstream/master with this branch
git push upstream pr-123:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment