diff options
author | Daniel Hahler <git@thequod.de> | 2018-01-24 21:18:20 +0100 |
---|---|---|
committer | Daniel Hahler <git@thequod.de> | 2018-02-12 10:12:22 +0100 |
commit | 2bf952b102bce70b879c00d2476a9a74eab5cfaf (patch) | |
tree | 46ba89848c35597e6dab0806516625152303aa13 /ChangeLog | |
parent | c18fe510f4321210ddb450cdfa08fbf2bae8a580 (diff) | |
download | zsh-2bf952b102bce70b879c00d2476a9a74eab5cfaf.tar.gz zsh-2bf952b102bce70b879c00d2476a9a74eab5cfaf.tar.xz zsh-2bf952b102bce70b879c00d2476a9a74eab5cfaf.zip |
42324: _git: handle mutually exclusive options
Currently `git show --stat -p` is not considered a valid completion and prevents further completions like `--no-abbrev`. It is a valid use case however to use `--stat` with `-p` (and there is a synonym `--patch-with-stat` for it even). This patch changes `__git_setup_diff_options` to only handle mutually exclusive arguments reported by Git (as a fatal error) in a special way.
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 59430a64d..4cc7820d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-02-12 Daniel Hahler <zsh@thequod.de> + + * 42324: Completion/Unix/Command/_git: _git: handle mutually exclusive + options. + 2018-02-11 Daniel Hahler <zsh@thequod.de> * 42327: Completion/Unix/Command/_make: _make: complete _files. |