merge-with-master

#!/opt/local/bin/fish

# Merge the current branch back into master.
function parse_git_branch; sh -c 'git branch --no-color 2> /dev/null' | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'; end
set branch_to_merge (parse_git_branch)
git co master
git merge $branch_to_merge