git: 8dd6ba22af - main - committers-guide: fix thinko: this should be --ff-only to match elsewhere

[Warner Losh]

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=8dd6ba22afde42ad1da8b48b8b11414378e0248c

commit 8dd6ba22afde42ad1da8b48b8b11414378e0248c
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-06-16 14:52:14 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-06-16 14:52:14 +0000

    committers-guide: fix thinko: this should be --ff-only to match elsewhere
---
 documentation/content/en/articles/committers-guide/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 6dffae7c69..44360132c1 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -744,7 +744,7 @@ It is important to start rebasing operations with a clean tree (Git usually requ
 [source,shell]
 ....
 % git checkout main
-% git pull --no-ff
+% git pull --ff-only
 % git rebase -i main no-color-ls
 ....