From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2012 22:21:00 +0000 (-0700)
Subject: Merge branch 'fc/git-prompt-script'
X-Git-Tag: v1.7.12-rc0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e90020cdb3273af3b0c7915c0aacf16b19bbf994;p=git.git

Merge branch 'fc/git-prompt-script'

Split a rather heavy-ish "git completion" script out to create a
separate "git prompting" script, to help lazy-autoloading of the
completion part while making prompting part always available.
---

e90020cdb3273af3b0c7915c0aacf16b19bbf994
diff --cc contrib/completion/git-completion.bash
index 2e1b5e14b,5d70cc428..ffedce751
mode 100755,100644..100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash