From 3da6865c14b60d0a0d94e1e66158c5bfb9f11e96 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 16 Jun 2021 08:54:04 -0600 Subject: committers-guide: git always requires a clean tree to rebase. Remove confusing word. Sponsored by: Netflix --- 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 44360132c1..e27ffcfe8e 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -739,7 +739,7 @@ I have opted to do it on the commit command line, but you can also do it with 'g When it is time to bring in a new version, it is almost the same as w/o the branches. You would update like you would above, but there is one extra command before you update, and one after. The following assumes you are starting with an unmodified tree. -It is important to start rebasing operations with a clean tree (Git usually requires this). +It is important to start rebasing operations with a clean tree (Git requires this). [source,shell] .... -- cgit v1.2.3