From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13388 invoked by alias); 23 Mar 2015 02:07:05 -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: 34762 Received: (qmail 11201 invoked from network); 23 Mar 2015 02:07:03 -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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received:received; s=postfix2; t=1427076422; bh=LHs7JxzVmH5gTmj vfZOQ21Y0YmSazNVsLpfUKC6oMxg=; b=rV5eAUYmq57/PWs6/35SJXgJU6luaz0 zP4/18LEUoZdKkOR+swnQEHqJbfigeDiLn6v7awjm3lC9Ti461tawsFz7UwIx6ju SieMmWKMOk6myS/smFjWVY6qgZtXkjnB8WCk9V+EqAvMQOUiGQKuFP417iiitavy VDckkvV0qRRI= From: Daniel Hahler To: zsh-workers@zsh.org Subject: [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool) Date: Mon, 23 Mar 2015 03:07:00 +0100 Message-Id: <1427076420-22022-1-git-send-email-genml+zsh-workers@thequod.de> X-Mailer: git-send-email 2.3.3.220.g9ab698f.dirty From: Daniel Hahler --- Completion/Unix/Command/_git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5524cb0..78d06d3 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -3336,7 +3336,7 @@ _git-count-objects () { _git-difftool () { # TODO: Is this fine, or do we need to modify the context or similar? _git-diff \ - '--dir-diff[diff a whole tree by prepare a temporary copy]' \ + '(-d --dir-diff)'{-d,--dir-diff}'[diff a whole tree by prepare a temporary copy]' \ '(-y --no-prompt --prompt)'{-y,--no-prompt}'[do not prompt before invocation of diff tool]' \ '(-y --no-prompt)--prompt[prompt before invocation of diff tool]' \ '(-t --tool -x --extcmd)'{-t,--tool=-}'[merge resolution program to use]: :__git_difftools' \ -- 2.3.3.220.g9ab698f.dirty