Add Makefile + bugfix abort prompting in git-rewrite-master