Rebase a local branch who's upstream has been rebased.

rebase-local-branch-from-rebased-upstream.sh

# Thanks to:
# http://stackoverflow.com/a/20423029 (recover rebased upstream)
# http://stackoverflow.com/a/11868440 (get current branch name)

# Note:
#   Be sure to checkout the branch you wish to re-sync / recover

# change this to desired upstream
upstream_branch=upstream/environment-detail

# just stores current branch name for later
current_branch=$(git symbolic-ref --short HEAD)

# finds common commit between upstream and current branch
fork_point=$(git merge-base --fork-point $upstream_branch $current_branch)

# perform rebase
git rebase --onto $upstream_branch $fork_point $current_branch