git debase

debase.zsh

# Similar to a squashed rebase
# Merges branch A into B, and then resets the branch to A,
#   producing an unstaged diff of B for your commit
# exampe usage: `debase master`
#   (note the lack of `git` prefix)
function debase() {
    if [[ -z $1 ]]; then
	echo 'missing branch to debase from'
    else
	branch=${1}
	git merge `echo $branch` && git reset --soft $branch && git status
    fi
}