Git tips

Delete commit

http://stackoverflow.com/questions/1338728/delete-commits-from-a-branch-in-git

Careful: git reset --hard WILL DELETE YOUR WORKING DIRECTORY CHANGES. Be sure to stash any local changes you want to keep before running this command.

git reset --hard HEAD~1

or

git reset --hard <sha1-commit-id>

Repush :
git push origin HEAD --force

Edit commit message

http://stackoverflow.com/questions/179123/edit-an-incorrect-commit-message-in-git

git commit --amend -m "New commit message"

Force push to remote

http://stackoverflow.com/questions/1338728/delete-commits-from-a-branch-in-git

git push origin HEAD --force

Merge commits

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

git rebase -i HEAD~4

  pick 01d1124 Adding license
  squash 6340aaa Moving license into its own file
  squash ebfd367 Jekyll has become self-aware.
  squash 30e0ccb Changed the tagline in the binary, too.