From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2015 20:49:22 +0000 (-0700)
Subject: Merge branch 'sg/complete-decorate-full-not-long' into maint
X-Git-Tag: v2.4.2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23903b9e290afeb6928955ee589799ee1a3c4c73

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

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