summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-05-16 22:57:01 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-05-16 22:57:22 +0000
commit7990cf983e90d4e9412768b73c851f10e1ddc1dd (patch)
tree092e2950a826d892c98f9999aff98b3e93e653d1
parentd52bf91659522435d68f719389095001f050b6c5 (diff)
downloadzsh-7990cf983e90d4e9412768b73c851f10e1ddc1dd.tar.gz
zsh-7990cf983e90d4e9412768b73c851f10e1ddc1dd.tar.xz
zsh-7990cf983e90d4e9412768b73c851f10e1ddc1dd.zip
35161: completion: git: Fix typo in 35061
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d95e81fa..b96a046a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-16  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 35161: Completion/Unix/Command/_git: completion: git: Fix
+	typo in 35061
+
 2015-05-15  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	*  35155: Src/lex.c: cmdpop() could sometimes get called too
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 4876534a5..ed23b39e8 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6231,7 +6231,7 @@ __git_setup_diff_options () {
     '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix'
     '(--src-prefix --dst-prefix)--no-prefix[do not show any source or destination prefix]'
 
-    '(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'
+    '(-c,--cc)'{-c,--cc}'[combined diff format for merge commits]'
 
     # TODO: --output is undocumented.
     '--output[undocumented]:undocumented')