A simply little snippet to squash your git commits into one commit for merging back to your source branch.

git_easy_squash.ps1

# Roll back all the commits done since branching from a develop branch but keep the changes.
# Note: Be careful to not loose your changes after running this command.
Write-Host "Rolling back commit tree to source branch."
git reset $(git merge-base develop $(git rev-parse --abbrev-ref HEAD))
Write-Host "Remember to commit all your changes and to run git push -f"

git_easy_squash.sh

# Roll back all the commits done since branching from a develop branch but keep the changes.
# Note: Be careful to not loose your changes after running this command.
# This one is experimental
echo "Rolling back commit tree to source branch."
git reset $(git merge-base develop $(git rev-parse --abbrev-ref HEAD))
echo "Remember to commit all your changes and to run git push -f"