Merge branch 'maint'

* maint: git-prompt: Document GIT_PS1_DESCRIBE_STYLE

Junio C Hamano committed Dec 11, 2012 at 15:50 UTC f993e2e15dbbb8a7d287c42a33e6d1887b594c52

No changes.