From 45090b19df0f7b8fa2efd9a9aac3e9a6c31a4c6b Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Tue, 6 Mar 2012 02:36:12 +0000 Subject: 30317: complete git merge --ff-only --- Completion/Unix/Command/_git | 1 + 1 file changed, 1 insertion(+) (limited to 'Completion') diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 5ed921850..78a13761a 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 reolved 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]' -- cgit 1.4.1