Here is how I work on heroku, use a branch, rebase and force push to clean your commit logs:

    git checkout -b heroku-setup
    # make some commits
    git push -u heroku heroku-setup:master
    # oops, something was wrong
    # make some more commits
    git push
    # ok, everything is working
    git rebase -i origin/master
    # squash/remove commits
    git push -f
    # test one last time
    git checkout master
    git merge --no-ff heroku-setup
    git push