about summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorWayne Davison <wayned@users.sourceforge.net>2005-02-20 02:28:29 +0000
committerWayne Davison <wayned@users.sourceforge.net>2005-02-20 02:28:29 +0000
commit4c7a5a6813d869bbdf67b29c625f57e8c16266c9 (patch)
tree90c597df741c8d04cf508bdd47c29f322b82043e /Completion/Unix/Command
parent59eecf6da3905d98609d8d62346fedca8c987674 (diff)
downloadzsh-4c7a5a6813d869bbdf67b29c625f57e8c16266c9.tar.gz
zsh-4c7a5a6813d869bbdf67b29c625f57e8c16266c9.tar.xz
zsh-4c7a5a6813d869bbdf67b29c625f57e8c16266c9.zip
Got rid of some of the specified option-conflicts between the
delete options -- I was using it to cut down on the useless
suggestions, but it was failing to continue completing if the
user specified something like "--delete-after --delete" (which
is valid but superfluous).  Also got rid of an accidental
option-conflict between --archive (-a) and --recursive (-r).
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_rsync14
1 files changed, 7 insertions, 7 deletions
diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync
index e8cb7708a..e8749bb06 100644
--- a/Completion/Unix/Command/_rsync
+++ b/Completion/Unix/Command/_rsync
@@ -86,7 +86,7 @@ _arguments -s \
   '*: :_rsync_files' \
   '(-q --quiet)'{-q,--quiet}'[suppress non-error messages]' \
   '(-c --checksum)'{-c,--checksum}'[skip based on checksums, not mod-time & size]' \
-  '(-a --archive -r --recursive)'{-a,--archive}'[archive mode; same as -rlptgoD (no -H)]' \
+  '(-a --archive)'{-a,--archive}'[archive mode; same as -rlptgoD (no -H)]' \
   '(-r --recursive)'{-r,--recursive}'[recurse into directories]' \
   '(-R --relative --no-relative)'{-R,--relative}'[use relative path names]' \
   '(-R --relative)--no-relative[turn off --relative]' \
@@ -120,12 +120,12 @@ _arguments -s \
   '--existing[only update files that already exist on receiving side]' \
   '--ignore-existing[ignore files that already exist on receiving side]' \
   '--remove-sent-files[transferred files/symlinks are removed from sending side]' \
-  '(--delete --delete-before --delete-during --delete-after)--del[an alias for --delete-during]' \
-  '(--del --delete-before --delete-during --delete-after)--delete[delete files that do not exist on the sending side]' \
-  '(--del --delete --delete-during --delete-after)--delete-before[receiver deletes before transfer]' \
-  '(--del --delete --delete-before --delete-after)--delete-during[receiver deletes during transfer]' \
-  '(--del --delete --delete-before --delete-during)--delete-after[receiver deletes after transfer]' \
-  '(--delete)--delete-excluded[also delete excluded files on the receiving side]' \
+  '(--delete-before --delete-during --delete-after)--del[an alias for --delete-during]' \
+  '--delete[delete files that do not exist on the sending side]' \
+  '(--del --delete-during --delete-after)--delete-before[receiver deletes before transfer]' \
+  '(--del --delete-before --delete-after)--delete-during[receiver deletes during transfer]' \
+  '(--del --delete-before --delete-during)--delete-after[receiver deletes after transfer]' \
+  '--delete-excluded[also delete excluded files on the receiving side]' \
   '--ignore-errors[delete even if there are I/O errors]' \
   '--force[force deletion of directories even if not empty]' \
   '--max-delete=[do not delete more than NUM files]:number:' \