Merge branch 'sg/complete-decorate-full-not-long'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:55 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:56 +0000 (14:23 -0700)
commit465868a22540d15d024ea4f8e2f4cfddf8f2edd7
tree0dbb24e2318614cb93e9b7861c1226b136521b06
parent02f8203740c63a2a8f2f63979b46ecfce976dfc0
parentaf16bdaa3fb25bd5811b09bc11c9244b1dcc684e
Merge branch 'sg/complete-decorate-full-not-long'

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