Date: Sun, 11 Apr 2021 12:04:22 GMT From: Marc Fonvieille <blackend@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: f86e96e387 - main - Add missing whitespace and correct tagging to one command. Message-ID: <202104111204.13BC4MUH000105@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=f86e96e3879af69e79e14126e154e06f01033ca5 commit f86e96e3879af69e79e14126e154e06f01033ca5 Author: Marc Fonvieille <blackend@FreeBSD.org> AuthorDate: 2021-04-11 11:54:17 +0000 Commit: Marc Fonvieille <blackend@FreeBSD.org> CommitDate: 2021-04-11 11:54:17 +0000 Add missing whitespace and correct tagging to one command. --- 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 19b83c68bb..c6c518614a 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -694,7 +694,7 @@ Eventually, when you are ready to commit your work back to main, you can perform === MFC (Merge From Current) Procedures ==== Summary -MFC workflow can be summarized as `git cherry-pick -x` plus git commit--amend to adjust the commit message. +MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --amend` to adjust the commit message. For multiple commits, use `git rebase -i` to squash them together and edit the commit message. ==== Single commit MFC
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104111204.13BC4MUH000105>