Git scripts to make life easier. Put somewhere in your $PATH, and ensure they are executable `chmod +x`

merged

#!/bin/sh -x
# Locally delete a upstream merged branch
# usage:
#   merged

ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0
CURRENT="${ref#refs/heads/}"

git checkout master
git pull origin master

git branch --delete $CURRENT

rebase

#!/bin/sh -x
# Rebase current branch against master and (optional force) push to origin
#
# usage:
#   rebase
# or:
#   rebase -f

git checkout master
git pull origin master
git checkout -
git rebase master
git push $1