completion: zsh: reorganize install instructions

felipec · gitster · commit cb9dcbdbe4b3 · 2020-10-26T15:23:26.000-07:00
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 &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
@@ -4,20 +4,22 @@
 #
 # 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.
 #
 # For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
 # 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 ()
 {

Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,22 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>`
`6`	`6`	`#`
`7`		`-# You need git's bash completion script installed somewhere, by default it`
`8`		`-# would be the location bash-completion uses.`
`9`		`-#`
`10`		`-# If your script is somewhere else, you can configure it on your ~/.zshrc:`
`11`		`-#`
`12`		`-# zstyle ':completion:::git:*' script ~/.git-completion.bash`
`13`		`-#`
`14`	`7`	`# The recommended way to install this script is to make a copy of it as a`
`15`	`8`	`# file named '_git' inside any directory in your fpath.`
`16`	`9`	`#`
`17`	`10`	`# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',`
`18`	`11`	`# and then add the following to your ~/.zshrc file:`
`19`	`12`	`#`
`20`	`13`	`# fpath=(~/.zsh $fpath)`
	`14`	`+#`
	`15`	`+# You need git's bash completion script installed. By default bash-completion's`
	`16`	`+# location will be used (e.g. /usr/share/bash-completion/completions/git).`
	`17`	`+#`
	`18`	`+# If your bash completion script is somewhere else, you can specify the`
	`19`	`+# location in your ~/.zshrc:`
	`20`	`+#`
	`21`	`+# zstyle ':completion:::git:*' script ~/.git-completion.bash`
	`22`	`+#`
`21`	`23`
`22`	`24`	`complete ()`
`23`	`25`	`{`