SZEDER Gábor <szeder@xxxxxxxxxx> writes: > Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx> > --- > contrib/completion/git-completion.bash | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index e848d5d..ad45717 100755 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1037,6 +1037,7 @@ _git_merge () > --*) > __gitcomp " > --no-commit --no-stat --log --no-log --squash --strategy > + --ff --no-ff > " > return > esac I do not have objections to the patch per-se, but it made me stop thinking for 2 minutes why there is --no-ff listed but not --no-squash, and I gave up, not being able to figure out why. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
