The Git working tree is comprised of files in their present state as they exist on the file system. The Git index -- to which files are staged -- is the second dimension. A commit of the staged files ...

There are three problems with the way the standard Gitflow diagram is presented: There is no differentiation between merge, branch and git commits. Colors are not used consistently. Support and bugfix ...