Commit Diff

Commit:
a85446b211f707066c360f637d4f824f8695828d
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
explicitly document that rebase requires a work tree reflecting a branch tip
Actions:
Patch | Tree
commit - e51d7b55a3d7fcd307ad6f65fa793a52a24dd697
commit + a85446b211f707066c360f637d4f824f8695828d
blob - 39066d0ed5236bde473e6e5748be94c96d93d114
blob + c75f6b4912ffa340dff42c71b199f9e1bf69ae8b
--- got/got.1
+++ got/got.1
@@ -930,8 +930,8 @@ when the rebase operation continues.
 .Pp
 .Cm got rebase
 will refuse to run if certain preconditions are not met.
-If the work tree contains multiple base commits it must first be updated
-to a single base commit with
+If the work tree is not yet fully updated to the tip commit of its
+branch then the work tree must first be updated with
 .Cm got update .
 If changes have been staged with
 .Cm got stage ,