From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:23:55 +0000 (-0700)
Subject: Merge branch 'sg/complete-decorate-full-not-long'
X-Git-Tag: v2.5.0-rc0~125
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/465868a22540d15d024ea4f8e2f4cfddf8f2edd7

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
---

465868a22540d15d024ea4f8e2f4cfddf8f2edd7
diff --cc contrib/completion/git-completion.bash
index 5944c824ab,2218a9c6f8..eae9dce590
mode 100644,100755..100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash