diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-22 17:49:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-22 17:49:02 -0800 |
| commit | f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb (patch) | |
| tree | ad5d2c598d006469bf3517e7ea39a10c3fb04e96 /contrib | |
| parent | 41799aa20904ff532ceb4f3ed95ba13e164dfc7a (diff) | |
| parent | 78f4c9f62549fdd9a52550449c4e3148e7e0900d (diff) | |
| download | git-f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb.tar.gz | |
Sync with 1.7.9.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3a05a5b74c..554e30e961 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -60,18 +60,6 @@ # per-repository basis by setting the bash.showUpstream config # variable. # -# -# To submit patches: -# -# *) Read Documentation/SubmittingPatches -# *) Send all patches to the current maintainer: -# -# "Shawn O. Pearce" <spearce@spearce.org> -# -# *) Always CC the Git mailing list: -# -# git@vger.kernel.org -# if [[ -n ${ZSH_VERSION-} ]]; then autoload -U +X bashcompinit && bashcompinit @@ -298,13 +286,13 @@ __git_ps1 () fi fi if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then - git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$" + git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$" fi if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then - if [ -n "$(git ls-files --others --exclude-standard)" ]; then - u="%" - fi + if [ -n "$(git ls-files --others --exclude-standard)" ]; then + u="%" + fi fi if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then |