Merge and squash a git branch

git-merge-squash.sh

# Say you are working on a branch called `my-branch`
# and you wish to now merge it into `master`, and
# squash all commits from `my-branch` into one commit.
# You can do the following:

git checkout master
git merge --squash my-branch
git commit

# You will then be placed in an editor with all your previous
# commits. First, add a one-liner at the top. Then, feel free
# to rewrite or remove the previous commit logs.