On this nice interactive comprehensive map the git model appears simple and clear : http://ndpsoftware.com/git-cheatsheet.html A chart on how to escape all sorts of git mess : http://justinhileman.info/article/git-pretty/git-pretty.png show how complex it can be to deal with this simple model, however Enjoy :-)