zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool)
@ 2015-03-23  2:07 Daniel Hahler
  2015-03-29  5:54 ` Daniel Shahaf
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Hahler @ 2015-03-23  2:07 UTC (permalink / raw)
  To: zsh-workers

From: Daniel Hahler <git@thequod.de>

---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool)
  2015-03-23  2:07 [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool) Daniel Hahler
@ 2015-03-29  5:54 ` Daniel Shahaf
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Shahaf @ 2015-03-29  5:54 UTC (permalink / raw)
  To: Daniel Hahler; +Cc: zsh-workers

Daniel Hahler wrote on Mon, Mar 23, 2015 at 03:07:00 +0100:
> -    '--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]' \

I pushed this after also fixing the grammaro ("by prepare"); thanks for
the patch.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-29  5:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-23  2:07 [PATCH] completion: git: add short option for '--dir-diff" (_git-difftool) Daniel Hahler
2015-03-29  5:54 ` Daniel Shahaf

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).