From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 04/29] completion: zsh: reorganize install instructions
Date: Sat, 24 Oct 2020 22:13:18 -0500 [thread overview]
Message-ID: <20201025031343.346913-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com>
Start with the most important thing; the proper location of this script,
then follow with the location of the slave script (git-completion.bash).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.zsh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 712ce2f4d1..05ccaac194 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -4,13 +4,6 @@
#
# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
#
-# You need git's bash completion script installed somewhere, by default it
-# would be the location bash-completion uses.
-#
-# If your script is somewhere else, you can configure it on your ~/.zshrc:
-#
-# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
-#
# The recommended way to install this script is to make a copy of it as a
# file named '_git' inside any directory in your fpath.
#
@@ -18,6 +11,15 @@
# and then add the following to your ~/.zshrc file:
#
# fpath=(~/.zsh $fpath)
+#
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. /usr/share/bash-completion/completions/git).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
+#
complete ()
{
--
2.29.0
next prev parent reply other threads:[~2020-10-25 3:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-25 3:13 [PATCH v2 00/29] completion: zsh: latest patches Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 01/29] completion: zsh: fix __gitcomp_direct() Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 02/29] completion: zsh: fix name due to broken autoloading Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 03/29] completion: zsh: fix bash script extension Felipe Contreras
2020-10-25 3:13 ` Felipe Contreras [this message]
2020-10-25 3:13 ` [PATCH v2 05/29] completion: zsh: fix for directories with spaces Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 06/29] completion: zsh: update slave script locations Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 07/29] completion: prompt: fix color for Zsh Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 08/29] completion: zsh: fix for command aliasing Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 09/29] completion: bash: synchronize zsh wrapper Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 10/29] completion: bash: remove " Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 11/29] completion: zsh: fix completion for --no-.. options Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 12/29] completion: fix conflict with bashcomp Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 13/29] completion: zsh: add missing direct_append Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 14/29] completion: zsh: fix splitting of words Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 15/29] completion: zsh: simplify compadd functions Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 16/29] completion: zsh: simplify direct compadd Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 17/29] completion: zsh: trivial cleanup Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 18/29] completion: zsh: simplify nl_append Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 19/29] completion: zsh: simplify file_direct Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 20/29] completion: zsh: shuffle functions around Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 21/29] completion: zsh: refactor command completion Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 22/29] completion: zsh: improve command tags Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 23/29] completion: zsh: add alias descriptions Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 24/29] completion: zsh: trivial simplification Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 25/29] completion: zsh: add simple version check Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 26/29] completion: bash: trivial cleanup Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 27/29] completion: bash: cleanup cygwin check Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 28/29] completion: bash: remove old compat wrappers Felipe Contreras
2020-10-25 3:13 ` [PATCH v2 29/29] Update copyright notices Felipe Contreras
2020-10-27 20:14 ` [PATCH v2 00/29] completion: zsh: latest patches Junio C Hamano
2020-10-28 1:48 ` Felipe Contreras
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=20201025031343.346913-5-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/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).