From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19795 invoked by alias); 22 Sep 2013 10:49:34 -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: 31753 Received: (qmail 29896 invoked from network); 22 Sep 2013 10:49:00 -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.215.46 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:in-reply-to:references :in-reply-to:references; bh=buW8yjsOzXM39WtuRZKweU6zP5J+4UpNfXtt76N0vQ4=; b=In8GGhpwBF8s72cCzY2oIf+qxnYcAqGscg4XzzXb8c+wTR5Nl69gZydC98I6dtaYFQ pbUV+GyfqDWQuOUsB/Rg3jeeapKlc+yqvku9cBQ/G2i9BeJwvYrZUUoNFfRKSaFB2Sw8 VCAN5t6qjMWuw0Tlkqh27aIQAmITZerMUg6cUl3EQC3hKZHgvpPIumSO8KFVMnIY8mtD yWCUJUFlZZDDcF71wj+5DnXK8oJiD3KqhBHY4VdNKHErxg74vM3Pi+1IB4yLOis6m5V5 T/u65ParJi/jOC3w8p/V2s6ee5l2nkWCynIz/yO7MsE5tKwkUCjN0z7QwoI+PxHB0eyX xbDw== X-Received: by 10.152.37.103 with SMTP id x7mr990619laj.28.1379846934823; Sun, 22 Sep 2013 03:48:54 -0700 (PDT) From: =?UTF-8?q?=C3=98ystein=20Walle?= To: zsh-workers@zsh.org Cc: m0viefreak Subject: [PATCH v2 12/14] _git: correct some "undocumented" options Date: Sun, 22 Sep 2013 12:48:26 +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 -G / -S: reword -S to emphase the difference to -G revision options: --abbrev: reword, to emphase the --abbrev-commit requirement --- Completion/Unix/Command/_git | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 4bb9d24..d465dfa 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5920,7 +5920,8 @@ __git_setup_diff_options () { '(-D --irreversible-delete)'{-D,--irreversible-delete}'[omit the preimage for deletes]' '-l-[limit number of rename/copy targets to run]: :__git_guard_number' '--diff-filter=-[select certain kinds of files for diff]: :_guard "[ACDMRTUXB*]#" kinds' - '-S-[look for differences that contain the given string]:string' + '-S-[look for differences that add or remove the given string]:string' + '-G-[look for differences whose added or removed line matches the given regex]:pattern' '--pickaxe-all[when -S finds a change, show all changes in that changeset]' '--pickaxe-regex[treat argument of -S as regular expression]' '-O-[output patch in the order of glob-pattern lines in given file]: :_files' @@ -5935,6 +5936,8 @@ __git_setup_diff_options () { '(--exit-code)--quiet[disable all output]' '( --no-ext-diff)--ext-diff[allow external diff helper to be executed]' '(--ext-diff )--no-ext-diff[disallow external diff helper to be executed]' + '(--textconv --no-textconv)--textconv[allow external text conversion filters to be run when comparing binary files]' + '(--textconv --no-textconv)--no-textconv[do not allow external text conversion filters to be run when comparing binary files]' '--ignore-submodules[ignore changes to submodules]:: :__git_ignore_submodules_whens' '(--no-prefix)--src-prefix=[use given prefix for source]:prefix' '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix' @@ -5949,12 +5952,6 @@ __git_setup_diff_options () { # TODO: --cumulative is undocumented. '--cumulative[undocumented]' - # TODO: --textconv is undocumented. - '--textconv[undocumented]' - # TODO: --no-textconv is undocumented. - '--no-textconv[undocumented]' - # TODO: -G is undocumented. - '-G[undocumented]' # TODO: --output is undocumented. '--output[undocumented]:undocumented') } @@ -5978,6 +5975,8 @@ __git_setup_revision_options () { format\:"specify own format"))' '(--abbrev-commit --no-abbrev-commit)--abbrev-commit[show only partial prefixes of commit object names]' '(--abbrev-commit --no-abbrev-commit)--no-abbrev-commit[show the full 40-byte hexadecimal commit object name]' + '(--abbrev --no-abbrev)--abbrev=[set minimum SHA1 display-length (for use with --abbrev-commit)]: :__git_guard_number length' + '(--abbrev --no-abbrev)--no-abbrev[show the full 40-byte hexadecimal commit object name]' '--oneline[shorthand for --pretty=oneline --abbrev-commit]' '--encoding=-[output log messages in given encoding]:: :__git_encodings' '(--no-notes --notes)--no-notes[do not show notes that annotate commit]' @@ -6046,9 +6045,6 @@ __git_setup_revision_options () { '--reflog[show all commits from reflogs]' '--default[use argument as default revision]:default revision:__git_revisions' - '--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length' - # TODO: --no-abbrev is undocumented. - '--no-abbrev[undocumented]' # TODO: --early-output is undocumented. '--early-output=-[undocumented]::undocumented' ) -- 1.8.2.2