mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

unposted: _git: Clean up superfluous and missing backslashes.

Browse source
This commit is contained in:
Daniel Shahaf 2016-07-30 17:29:20 +00:00
parent a3b5389641
commit 9ef02744dd
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2016-07-31 Daniel Shahaf <d.s@daniel.shahaf.name> 2016-07-31 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Completion/Unix/Command/_git: Clean up superfluous
and missing backslashes.
* 38967: Completion/Unix/Type/_hosts: Don't complete wildcard * 38967: Completion/Unix/Type/_hosts: Don't complete wildcard
entries from ~/.ssh/known_hosts. entries from ~/.ssh/known_hosts.

6
Completion/Unix/Command/_git
View file

@ -1407,7 +1407,7 @@ _git-revert () {
'(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \ '(-n --no-commit)'{-n,--no-commit}'[do not commit the reversion]' \
'(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \ '(-s --signoff)'{-s,--signoff}'[add Signed-off-by line at the end of the commit message]' \
'--strategy=[use given merge strategy]:merge strategy:__git_merge_strategies' \ '--strategy=[use given merge strategy]:merge strategy:__git_merge_strategies' \
'*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' \
'(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=-}'[GPG-sign the commit]::key id' \ '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=-}'[GPG-sign the commit]::key id' \
'(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \ '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \
': :__git_commits' ': :__git_commits'
@ -6767,8 +6767,8 @@ __git_setup_merge_options () {
'( --no-squash)--squash[merge, but do not commit]' '( --no-squash)--squash[merge, but do not commit]'
'(--squash )--no-squash[merge and commit]' '(--squash )--no-squash[merge and commit]'
'--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]' '--ff-only[refuse to merge unless HEAD is up to date or merge can be resolved as a fast-forward]'
'(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id' \ '(-S --gpg-sign --no-gpg-sign)'{-S-,--gpg-sign=}'[GPG-sign the commit]::key id'
'(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]' \ '(-S --gpg-sign --no-gpg-sign)--no-gpg-sign[do not GPG-sign the commit]'
'*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
'*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option' '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]:option'
'(--verify-signatures)--verify-signatures[verify the commits being merged or abort]' '(--verify-signatures)--verify-signatures[verify the commits being merged or abort]'