Commit Diff

Commit:
65db4ffb3adb537c4258731721f250ee99b9d13c
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
document that 'got integrate' cannot be used during a histedit operation
Actions:
Patch | Tree
commit - ddbfac99a53fa279ca4ddb1557f2b93d255879a8
commit + 65db4ffb3adb537c4258731721f250ee99b9d13c
blob - b51947752695eec9954f4d45908991232387976d
blob + f40d55e304298e98916a2bc0e66a0f886ea171bb
--- got/got.1
+++ got/got.1
@@ -1120,7 +1120,9 @@ path prefix, the work tree cannot be used to edit the 
 .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