diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
commit | e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74 (patch) | |
tree | 8486633f6232f49ea330ab8e036decb5dc3bbf74 /Completion/Unix/Command/_patchutils | |
parent | f8edeff2494bf23e2ee29d4c761361b1c878e09d (diff) | |
parent | dc475bfa0ec6cd03789dde3bf28f71e0ea9d5003 (diff) | |
download | zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.tar.gz zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.zip |
Merge tag '5.4.1' into debian
Release 5.4.1.
Diffstat (limited to 'Completion/Unix/Command/_patchutils')
-rw-r--r-- | Completion/Unix/Command/_patchutils | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Completion/Unix/Command/_patchutils b/Completion/Unix/Command/_patchutils index 323c0a730..50ea3e4c4 100644 --- a/Completion/Unix/Command/_patchutils +++ b/Completion/Unix/Command/_patchutils @@ -43,6 +43,7 @@ case $service in '(-F --files)'{-F+,--files=}'[only list files within specified range]:range' '--strip=[remove specified number of pathname components before displaying]:components' '--addprefix=[insert specified path prefix before displaying path names]:prefix:_directories' + '*:diff file:_files' ) ;| grepdiff|lsdiff) @@ -58,7 +59,6 @@ case $service in \*{-v,--verbose}'[verbose operation]' '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the name of the patch file containing each patch]' '!--filter' '!--grep' - '*:diff file:_files' ) ;; grepdiff|filterdiff) @@ -71,7 +71,7 @@ case $service in '--as-numbered-lines=[display lines of selected hunks]:line numbers:(before after)' "--remove-timestamps[don't include timestamps in output]" ) - ;; + ;| filterdiff) args+=( '(-X --exclude-from-file)'{-X+,--exclude-from-file=}'[exclude files matching any pattern listed in specified file]:file:_files' |