diff options
| author | Daniel Hahler <git@thequod.de> | 2015-03-29 05:51:57 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-03-29 05:52:44 +0000 |
| commit | 0b79922edbd8a22343f91bc022ce2ad3dd00c5de (patch) | |
| tree | 0284ec529e37a5b5f7a81af29961dd35542e4fc4 | |
| parent | 81ba83797240f38769a624a98c1e73ba2f9f9906 (diff) | |
| download | zsh-0b79922edbd8a22343f91bc022ce2ad3dd00c5de.tar.gz zsh-0b79922edbd8a22343f91bc022ce2ad3dd00c5de.tar.xz zsh-0b79922edbd8a22343f91bc022ce2ad3dd00c5de.zip | |
34762: completion: git: add short option for '--dir-diff' (_git-difftool)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2527e9e9e..feb7ca8e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-29 Daniel Hahler <git@thequod.de> + + * 34762: Completion/Unix/Command/_git: completion: git: add + short option for '--dir-diff' (_git-difftool) + 2015-03-28 Barton E. Schaefer <schaefer@zsh.org> * 34804: Src/lex.c: refine 34734 POSIX_ALIAS change to preserve diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5524cb017..9dafd3c97 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 preparing 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' \ |