summaryrefslogtreecommitdiffstats
path: root/Completion/Unix/Command/_git
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2018-01-23 11:01:55 +0100
committerOliver Kiddle <opk@zsh.org>2018-01-23 11:03:00 +0100
commit47430bcd7cb2fade4d8753d920a2720eeca52f6a (patch)
tree98377cd51b72bbd0efe9406fd9e3aeab46c2ebae /Completion/Unix/Command/_git
parent42299: correct optional argument (diff)
downloadzsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar.gz
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar.bz2
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar.lz
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar.xz
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.tar.zst
zsh-47430bcd7cb2fade4d8753d920a2720eeca52f6a.zip
42317: completion option updates for commands that have had recent updates
Diffstat (limited to 'Completion/Unix/Command/_git')
-rw-r--r--Completion/Unix/Command/_git88
1 files changed, 64 insertions, 24 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a46da5b3c..30ca80835 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -60,9 +60,10 @@ _git-add () {
'(-i --interactive : -)'{-i,--interactive}'[add contents interactively to index]' \
'(-p --patch)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \
'(-e --edit)'{-e,--edit}'[open diff against index in editor]' \
- '(-A --all --no-ignore-removal -u --update --no-all --ignore-removal)'{-A,--all,--no-ignore-removal}'[add, modify, and remove index entries to match the working tree]' \
- '(-A --all --no-ignore-removal -u --update --no-all --ignore-removal)'{--no-all,--ignore-removal}'[like "--all" but ignore removals]' \
+ '(-A --all --no-ignore-removal -u --update --no-all --ignore-removal --renormalize)'{-A,--all,--no-ignore-removal}'[add, modify, and remove index entries to match the working tree]' \
+ '(-A --all --no-ignore-removal -u --update --no-all --ignore-removal --renormalize)'{--no-all,--ignore-removal}'[like "--all" but ignore removals]' \
'(-A --all --no-ignore-removal -u --update --no-all --ignore-removal)'{-u,--update}'[update the index just where it already has an entry matching <pathspec>]' \
+ '(-A --all --no-ignore-removal -u --update --no-all --ignore-removal)--renormalize[renormalize EOL of tracked files (implies -u)]' \
'(-N --intent-to-add)'{-N,--intent-to-add}'[record only that path will be added later]' \
'--refresh[do not add files, but refresh their stat() info in index]' \
'--ignore-errors[continue adding if an error occurs]' \
@@ -1207,7 +1208,6 @@ _git-merge () {