summary refs log tree commit diff
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2013-10-20 19:41:00 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-10-21 17:39:48 +0200
commit7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599 (patch)
tree61a9b037b03546b6536212d2748d17146281d7b7
parent34ba14e1ec69e3811a72ecc3545e99890bff578a (diff)
downloadzsh-7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599.tar.gz
zsh-7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599.tar.xz
zsh-7872a5becdc3ead1d8ea809bfe88b8d9a0b4b599.zip
31854: _git: Make git-show accept diff arguments
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f424c83c0..b54a778ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* 31853: Completion/Unix/Command/_git: _git: Add missing column.*
 	config variables
 
+	* 31854: Completion/Unix/Command/_git: _git: Make git-show accept
+	diff arguments
+
 2013-10-19  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31851: Src/exec.c: execstring() should display string to
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 620d2c966..63aa78512 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1419,9 +1419,10 @@ _git-show () {
   local curcontext=$curcontext state line ret=1
   typeset -A opt_args
 
-  local -a log_options revision_options
+  local -a log_options revision_options diff_options
   __git_setup_log_options
   __git_setup_revision_options
+  __git_setup_diff_options
 
   _arguments -w -C -s \
     $log_options \