git remaster

README.md

git-remaster updates both your current branch and master branch simultaneously, while preserving all commited, staged and unstaged changes.

Install

Add git-remaster to your path and make it executable:

curl https://gist.githubusercontent.com/ricardobeat/9600953/raw/git-remaster.sh > /usr/local/bin/git-remaster
chmod +x /usr/local/bin/git-remaster

git-remaster.sh

#!/bin/bash
 
## git-remaster
# Pulls latest remote HEAD to your master and rebases current branch on top of it, preserving staged and unstaged changes.

set -e

if git show-ref --quiet --verify refs/heads/master; then MASTER=master; fi
if git show-ref --quiet --verify refs/heads/trunk; then MASTER=trunk; fi
if [ -z $MASTER ]; then echo "No master/trunk branch found."; exit 1; fi

BRANCH=$(git rev-parse --abbrev-ref HEAD)

# save current state to a detached commit object and reset
RSTASH=$(git stash create --include-untracked)
git reset --hard
[[ $RSTASH ]] && echo "Stashed $RSTASH"
    
# fetch updates
git fetch origin

# if not on master branch, check it out, update and return to branch
if [[ $BRANCH != $MASTER ]]; then
  git checkout $MASTER
  git rebase origin/$MASTER --preserve-merges
  git checkout -
fi
 
# rebase changes on top of origin/master
git rebase origin/$MASTER --preserve-merges
 
# bring back stash if available, hide errors when empty
test $RSTASH && git stash apply $RSTASH 2>/dev/null

Note: if you get merge conflicts, remember you are either in the middle of a rebase, or after stash apply.

Lindo!