From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28245 invoked by alias); 28 Jul 2013 16:23:28 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31603 Received: (qmail 18557 invoked from network); 28 Jul 2013 16:23:10 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, T_TO_NO_BRKTS_FREEMAIL autolearn=ham version=3.3.2 Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.180 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=qWq0axbV7nvyyQN8aPj0yGs074A/pagpTFCROQJziKc=; b=m1ovq9HpfvjuZIFHLcPhwtJheEiLyyIPETAqJBbu2t2h9qY255k7fgSow0XNSLLgem qF+y/XZ5aLFsUBBAsjzeKYr5ouE8qkI4SMFu2kcSXI0BVYFRFn7MIXdxhz8FDwWBM6VN 0syvDvqa3qWt1cJvePGnOCvkyVq3t7sywpfms6X0TtIqqqM/LTFSzzs6+O8T9ou8JZy0 f246WqypnkpXEr74kQmY3+7zlt4LDMFglr1+SLJmSfSHOH+FMLcn6X8QCv5pLTvCuBi4 6BaN8hPpapZK5iXcd5HPd4I0N9iY87k+SIePUFHaubi3asOn4AAJDCpAOb/ScjXOR2fU 5ngw== X-Received: by 10.152.6.169 with SMTP id c9mr25398285laa.47.1375028585445; Sun, 28 Jul 2013 09:23:05 -0700 (PDT) From: =?UTF-8?q?=C3=98ystein=20Walle?= To: zsh-workers@zsh.org Cc: m0viefreak.cm@googlemail.com Subject: [PATCH 12/16] _git: correct some "undocumented" options Date: Sun, 28 Jul 2013 18:22:09 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.2 In-Reply-To: References: In-Reply-To: References: From: m0viefreak diff options: --cumulative is deprecated --> remove --follow was already in there --> remove duplicate -G / -S: reword -S to emphase the difference to -G revision options: --abbrev: reword, to emphase the --abbrev-commit requirement --- Completion/Unix/Command/_git | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 916fbaf..b30d088 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -2965,10 +2965,9 @@ _git-reflog () { (( $+functions[_git-relink] )) || _git-relink () { - # TODO: --help is undocumented. _arguments \ '--safe[stop if two objects with the same hash exist but have different sizes]' \ - '--help[display help]' \ + '(-)'{-h,--help}'[display usage information]' \ ': :_directories' \ ': :_directories' \ '*: :_directories' @@ -3928,7 +3927,6 @@ _git-merge-file () { fi # TODO: --marker-size in undocumented. - # TODO: --diff3 is undocumented. _arguments \ $label_opt \ '(-p --stdout)'{-p,--stdout}'[send merged file to standard output instead of overwriting first file]' \ @@ -3937,7 +3935,7 @@ _git-merge-file () { '(--ours --union)--theirs[resolve conflicts favoring their side of the lines]' \ '(--ours --theirs )--union[resolve conflicts favoring both sides of the lines]' \ '--marker-size[specify length of conflict markers]: :__git_guard_number "marker length"' \ - '--diff3[undocumented]' \ + '--diff3[use a diff3 based merge]' \ ':current file:_files' \ ':base file:_files' \ ':other file:_files' @@ -4010,8 +4008,8 @@ _git-pack-objects () { '--delta-base-offset[use delta-base-offset packing]' \ '--threads=-[specify number of threads for searching for best delta matches]: :__git_guard_number "number of threads"' \ '--keep-true-parents[pack parents hidden by grafts]' \ - '( --unpack-unreachable)--keep-unreachable[undocumented]' \ - '(--keep-unreachable )--unpack-unreachable[undocumented]' \ + '( --unpack-unreachable)--keep-unreachable[keep unreachable objects]' \ + '(--keep-unreachable )--unpack-unreachable=[unpack unreachable objects newer than