Merge branch 'pd/completion-filenames-fix'

gitster · gitster · commit e82f629cf407 · 2015-01-07T13:06:37.000-08:00
The top-of-the-file instruction for completion scripts (in contrib/)
did not name the files correctly.

* pd/completion-filenames-fix:
  Update documentation occurrences of filename .sh
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -16,9 +16,9 @@
 #
 # To use these routines:
 #
-#    1) Copy this file to somewhere (e.g. ~/.git-completion.sh).
+#    1) Copy this file to somewhere (e.g. ~/.git-completion.bash).
 #    2) Add the following line to your .bashrc/.zshrc:
-#        source ~/.git-completion.sh
+#        source ~/.git-completion.bash
 #    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
@@ -9,7 +9,7 @@
 #
 # If your script is somewhere else, you can configure it on your ~/.zshrc:
 #
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
 #
 # The recommended way to install this script is to copy to '~/.zsh/_git', and
 # then add the following to your ~/.zshrc file:

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@`
`16`	`16`	`#`
`17`	`17`	`# To use these routines:`
`18`	`18`	`#`
`19`		`-# 1) Copy this file to somewhere (e.g. ~/.git-completion.sh).`
	`19`	`+# 1) Copy this file to somewhere (e.g. ~/.git-completion.bash).`
`20`	`20`	`# 2) Add the following line to your .bashrc/.zshrc:`
`21`		`-# source ~/.git-completion.sh`
	`21`	`+# source ~/.git-completion.bash`
`22`	`22`	`# 3) Consider changing your PS1 to also show the current branch,`
`23`	`23`	`# see git-prompt.sh for details.`
`24`	`24`	`#`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`# If your script is somewhere else, you can configure it on your ~/.zshrc:`
`11`	`11`	`#`
`12`		`-# zstyle ':completion:::git:*' script ~/.git-completion.sh`
	`12`	`+# zstyle ':completion:::git:*' script ~/.git-completion.zsh`
`13`	`13`	`#`
`14`	`14`	`# The recommended way to install this script is to copy to '~/.zsh/_git', and`
`15`	`15`	`# then add the following to your ~/.zshrc file:`