diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-07-22 21:40:10 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-07-22 21:40:10 +0200 |
| commit | 5c7ac461932c17df91374e6c2740ad22c95481af (patch) | |
| tree | 85d21004331d9d1bfca266d111000acd7fa1725a /Completion/Unix/Command/_git | |
| parent | 3988419a8dc4a74e491df584804a77a2f8be88cd (diff) | |
| parent | e27142d45686cacc6ed155e5045b97dd6243d44c (diff) | |
| download | zsh-5c7ac461932c17df91374e6c2740ad22c95481af.tar.gz zsh-5c7ac461932c17df91374e6c2740ad22c95481af.zip | |
New upstream release
Diffstat (limited to 'Completion/Unix/Command/_git')
| -rw-r--r-- | Completion/Unix/Command/_git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5ed921850..88c765fb0 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5753,6 +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 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]' |