Commit 65db4ffb3adb537c4258731721f250ee99b9d13c

Stefan Sperling 2020-02-24T21:22:56

document that 'got integrate' cannot be used during a histedit operation

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 b519477..f40d55e 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1120,7 +1120,9 @@ path prefix, the work tree cannot be used to edit the history of this branch.
 .Pp
 The
 .Cm got update
-command will refuse to run while a histedit operation is in progress.
+and
+.Cm got integrate
+commands will refuse to run while a histedit operation is in progress.
 Other commands which manipulate the work tree may be used, and the
 .Cm got commit
 command may be used to commit arbitrary changes to the temporary branch