Merge branch 'pd/completion-filenames-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:06:36 +0000 (13:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:06:37 +0000 (13:06 -0800)
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

contrib/completion/git-completion.bash
contrib/completion/git-completion.zsh
index 23988ec124a85d766006c6cd569c8341d3612c8b..cd765795ae42edfdf21a054619b64d5c3800f4f6 100644 (file)
@@ -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.
 #
index 9f6f0fa5581002a2371e062fd5def0978733edc1..e25541308a1c269285a26b205d2d9990a789060a 100644 (file)
@@ -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: