Add state and step

fixes #360

Merge branch 'iliakan-master'

Merge branch 'ogr3-pwned-with-upstream'

Fixes #310

Updated spec file in preparation of release 2.6.1

Merge pull request #260 from ogr3/colors-as-function

Extract color definition loading as a function

GIT_PROMPT_SHOW_UNTRACKED_FILES=no was not working correctly

* Fixed the bug, than GIT_SHOW_UNTRACKED_FILES=no was not respected
* Renamed GIT_SHOW_UNTRACKED_FILES to GIT_PROMPT_SHOW_UNTRACKED_FILES as
  this is more consistent to the other environment variables
* GIT_PROMPT_SHOW_UNTRACKED_FILES can be now also set on a per
  repository basis in .bash-git-rc
* Updated README

Fixes #215 and 216

Merge pull request #214 from root42/untracked-files

Make counting ALL untracked files optional

Merge pull request #116 from lslezak/master

Added openSUSE themes

GIT_PROMPT_IGNORE_STASH was broken. Fixes #106

Revert ".git was being touched continuously"

This reverts commit 7855e77.