summaryrefslogtreecommitdiff
path: root/Completion/Unix/Command/_git
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2015-05-14 19:03:21 +0200
committerOliver Kiddle <opk@zsh.org>2015-05-14 19:03:21 +0200
commit968c5ceaa7e0c6ec56073c23001a025de610fb12 (patch)
tree229c6ccb8c33b1669faa055c61e33c6b08195302 /Completion/Unix/Command/_git
parenta1c1f6828c4e708fe07868b9ec531ba4c4807cde (diff)
downloadzsh-968c5ceaa7e0c6ec56073c23001a025de610fb12.tar.gz
zsh-968c5ceaa7e0c6ec56073c23001a025de610fb12.zip
35062: __git_setup_revision_options includes __git_setup_diff_options
Diffstat (limited to 'Completion/Unix/Command/_git')
-rw-r--r--Completion/Unix/Command/_git5
1 files changed, 1 insertions, 4 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 631d2f798..c13ec127a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1083,12 +1083,10 @@ _git-log () {
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 \
$revision_options \
- $diff_options \
'-L+[trace the evolution of a line range or regex within a file]:range' \
'(-)--[start file arguments]' \
'*:: :->commit-range-or-file' && ret=0
@@ -1486,10 +1484,9 @@ _git-show () {
local curcontext=$curcontext state line ret=1
typeset -A opt_args
- local -a log_options revision_options diff_options
+ local -a log_options revision_options
__git_setup_log_options
__git_setup_revision_options
- __git_setup_diff_options
_arguments -w -C -s \
$log_options \