about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git10
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 80d62f38e..b71b0cd28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* 34470: Completion/Unix/Command/_adb: completion: adb: add
 	"sideload" command
 
+	* 34467: Completion/Unix/Command/_git: completion: git: minor doc
+	fixes
+
 2015-02-07  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 34464: Completion/Unix/Command/_mtr: Update mtr completion
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 17c4d5792..50eb4d365 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4,7 +4,7 @@
 #
 # Say you got your own git sub-commands (git will run a program `git-foo'
 # when you run "git foo") and you want "git f<tab>" to complete that sub
-# commands name for you. You can make that sub-command know to the completion
+# commands name for you. You can make that sub-command known to the completion
 # via the user-command style:
 #
 #     % zstyle ':completion:*:*:git:*' user-commands foo:'description for foo'
@@ -20,17 +20,13 @@
 # completion as well.  Place such a function inside an autoloaded #compdef file
 # and you should be all set.  You can add a description to such a function by
 # adding a line matching
-# 
+#
 #     #description DESCRIPTION
 #
 # as the second line in the file.  See
 # Completion/Debian/Command/_git-buildpackage in the Zsh sources for an
 # example.
 #
-# As this solution is so much better than the user-commands zstyle method, the
-# zstyle method is now DEPRECATED.  It will most likely be removed in the next
-# major release of Zsh (5.0).
-#
 # When _git does not know a given sub-command (say `bar'), it falls back to
 # completing file names for all arguments to that sub command. I.e.:
 #
@@ -5219,7 +5215,7 @@ _git_commands () {
     plumbing-sync-commands \
     plumbing-sync-helper-commands \
     plumbing-internal-helper-commands
- 
+
   while _tags; do
 
     _requested aliases && \