Merge branch 'maint'
commitf993e2e15dbbb8a7d287c42a33e6d1887b594c52
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Dec 2012 23:50:10 +0000 (11 15:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Dec 2012 23:50:10 +0000 (11 15:50 -0800)
treef8ff61283db304a9213185b7998c08589f7f2939
parent7e0651a6302b50db4bac1e65da61c4036cc64d2a
parent50b03b04c06f44be0d09bcc2b56723e8de985d9a
Merge branch 'maint'

* maint:
  git-prompt: Document GIT_PS1_DESCRIBE_STYLE
contrib/completion/git-prompt.sh