Skip to content

Instantly share code, notes, and snippets.

@DennisOSRM

DennisOSRM/rebase.sh

Created February 19, 2014 15:28
Download ZIP

Revisions

  1. DennisOSRM created this gist Feb 19, 2014.
    25 changes: 25 additions & 0 deletions rebase.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,25 @@
    #!/bin/sh
    set -e

    # Get the current branch name.
    branch=`git rev-parse --abbrev-ref HEAD`
    # Determine the commit at which the current branch diverged.
    ancestor=`git merge-base develop HEAD`
    # Stash any uncommited, changed files.
    git stash --all
    # Revert the branch back to the ancestor SHA.
    git reset --hard $ancestor
    # Squash all commits from ancestor to previous SHA.
    git merge --squash HEAD@{1}
    # Perform the commit, prompting for the message.
    git commit
    # Fetch the latest changes from the upstream branch.
    git fetch origin develop
    # Rebase the current single commit onto the latest.
    git rebase develop
    # Restore previous uncommited changes, if any.
    git stash pop || true

    printf "\nDone! Push with 'git push -f origin %s'\n" "$branch"

    exit 0 # High five! Everything worked.