amatmv

#! /bin/sh
# Produce a squash-commit patch from a branch of changes
# Usage example: sh git-squash.sh master <branch_to_squash>
MASTER=$1
PATCHBRANCH=$2
SQUASHBRANCH="$PATCHBRANCH-squash"

git checkout -b "$SQUASHBRANCH" $MASTER &&
git merge --squash "$PATCHBRANCH" &&
git commit -a -m "Squash commit" &&