From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 11/11] Revert "Update documentation occurrences of filename .sh"
Date: Thu, 19 May 2016 23:58:45 -0500 [thread overview]
Message-ID: <1463720325-8853-12-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1463720325-8853-1-git-send-email-felipe.contreras@gmail.com>
The original code was correct: the example location ~/.git-completion.sh
is correct, because it's not only used by Bash. And zstyle command in
Zsh should use that same location; the Bash script.
This reverts commit 0e5ed7cca3c51c821c2bb0465617e75d994f432f.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.bash | 4 ++--
contrib/completion/git-completion.zsh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 398f3a7..3224ae1 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -17,9 +17,9 @@
#
# To use these routines:
#
-# 1) Copy this file to somewhere (e.g. ~/.git-completion.bash).
+# 1) Copy this file to somewhere (e.g. ~/.git-completion.sh).
# 2) Add the following line to your .bashrc/.zshrc:
-# source ~/.git-completion.bash
+# source ~/.git-completion.sh
# 3) Consider changing your PS1 to also show the current branch,
# see git-prompt.sh for details.
#
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 28eaaed..6075111 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -9,7 +9,7 @@
#
# If your script is somewhere else, you can configure it on your ~/.zshrc:
#
-# zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
+# zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
#
# The recommended way to install this script is to copy to '~/.zsh/_git', and
# then add the following to your ~/.zshrc file:
--
2.8.0+fc1
prev parent reply other threads:[~2016-05-20 4:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 4:58 [PATCH 00/11] Completion fixes and improvements Felipe Contreras
2016-05-20 4:58 ` [PATCH 01/11] completion: add missing fetch options Felipe Contreras
2016-05-20 4:58 ` [PATCH 02/11] completion: bash: remove old wrappers Felipe Contreras
2016-05-20 4:58 ` [PATCH 03/11] completion: bash: remove zsh wrapper Felipe Contreras
2016-05-20 4:58 ` [PATCH 04/11] completion: zsh: don't hide ourselves Felipe Contreras
2016-05-20 4:58 ` [PATCH 05/11] completion: remove zsh hack Felipe Contreras
2016-05-20 4:58 ` [PATCH 06/11] completion: zsh: trivial cleanups Felipe Contreras
2016-05-20 4:58 ` [PATCH 07/11] completion: bash: cleanup cygwin check Felipe Contreras
2016-05-20 4:58 ` [PATCH 08/11] completion: zsh: improve main function selection Felipe Contreras
2016-05-20 4:58 ` [PATCH 09/11] completion: zsh: fix for directories with spaces Felipe Contreras
2016-05-20 4:58 ` [PATCH 10/11] completion: prompt: fix for Zsh Felipe Contreras
2016-05-20 4:58 ` Felipe Contreras [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463720325-8853-12-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).