Merge branch 'sg/complete-decorate-full-not-long' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:49:22 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:49:22 +0000 (13:49 -0700)
commit23903b9e290afeb6928955ee589799ee1a3c4c73
treef52ec671801aef467ae8ee35e35b1f3d75f44f6d
parenta2e5c79c69ee6109b06efe9a483df5e6708432fe
parentaf16bdaa3fb25bd5811b09bc11c9244b1dcc684e
Merge branch 'sg/complete-decorate-full-not-long' into maint

The completion for "log --decorate=" parameter value was incorrect.

* sg/complete-decorate-full-not-long:
  completion: fix and update 'git log --decorate=' options
contrib/completion/git-completion.bash