Merge and clean history

squash.sh

#! /bin/bash

# move to your local branch
git checkout local_branch

# pull the remotes
git fetch --all

# merge and squash
git merge origin/dirty_branch --squash

# create your new commit
git commit -m "New stuff"