Commit a85446b211f707066c360f637d4f824f8695828d

Stefan Sperling 2020-01-04T08:49:31

explicitly document that rebase requires a work tree reflecting a branch tip

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/got/got.1 b/got/got.1
index 39066d0..c75f6b4 100644
--- a/got/got.1
+++ b/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 ,