Some shell functions I use to help me effortlessly do clean rebasing and pushing in git.

git-helper-functions.sh

function rebase {
  if [[ $1 == "" ]]; then master='master'; else master=$1; fi
  branch=`git branch | grep \* | awk '{print $2}'` &&
  git checkout $master && git pull && git rebase $master $branch
}

function push {
  if [[ $1 == "" ]]; then master='master'; else master=$1; fi
  branch=`git branch | grep \* | awk '{print $2}'` &&
  rebase $master && git checkout $master && git merge $branch && git push &&
  git checkout $branch
}