mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

unposted: fix a typo in _git from previous commit (reolved)

Browse source
This commit is contained in:
Mikael Magnusson 2012-03-06 16:38:25 +00:00
parent 45090b19df
commit 43ddb73297
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Completion/Unix/Command/_git
View file

@ -5753,7 +5753,7 @@ __git_setup_merge_options () {
'(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
'( --no-squash)--squash[merge, but do not commit]'
'(--squash )--no-squash[merge and commit]'
'--ff-only[refuse to merge unless HEAD is up to date or merge can be reolved 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,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
'*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
'(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'