diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2012-03-06 16:38:25 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2012-03-06 16:38:25 +0000 |
| commit | 43ddb7329773fb1bc7c9aa454fa82d747fb3b069 (patch) | |
| tree | 2a2c9d2c81d70b8a6c1c0c5aca6d4cc2f043780e /Completion/Unix/Command/_git | |
| parent | 45090b19df0f7b8fa2efd9a9aac3e9a6c31a4c6b (diff) | |
| download | zsh-43ddb7329773fb1bc7c9aa454fa82d747fb3b069.tar.gz zsh-43ddb7329773fb1bc7c9aa454fa82d747fb3b069.tar.xz zsh-43ddb7329773fb1bc7c9aa454fa82d747fb3b069.zip | |
unposted: fix a typo in _git from previous commit (reolved)
Diffstat (limited to 'Completion/Unix/Command/_git')
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 78a13761a..88c765fb0 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -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]' |