Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] completion: git: add short option for '--dir-diff" (_git-difftool)
- X-seq: zsh-workers 34762
- From: Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool)
- Date: Mon, 23 Mar 2015 03:07:00 +0100
- 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=
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
From: Daniel Hahler <git@xxxxxxxxxx>
---
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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author