Move code only used by git-rebase--merge.sh out of git-rebase.sh
Start removing branch argument restriction