commit dae92a245f6e4d18c4c75048d6ca667d78083cc4 from: Stefan Sperling date: Sun Jan 08 11:29:10 2023 UTC in got.1, update list of commands which refuse to run during rebase/histedit commit - 1a99e0b4097b26cac736de07239a3be7589a48f7 commit + dae92a245f6e4d18c4c75048d6ca667d78083cc4 blob - 4a617a41b7073d575cc264c085ff352daa38f63c blob + c86779cca9d917f301a8ac66e723282c6c0bcb57 --- got/got.1 +++ got/got.1 @@ -2178,9 +2178,12 @@ contains changes to files outside of the work tree's p the work tree cannot be used to rebase this branch. .Pp The -.Cm got update +.Cm got update , +.Cm got integrate , +.Cm got merge , +.Cm got commit , and -.Cm got commit +.Cm got histedit commands will refuse to run while a rebase operation is in progress. Other commands which manipulate the work tree may be used for conflict resolution purposes. @@ -2423,6 +2426,7 @@ path prefix, the work tree cannot be used to edit the The .Cm got update , .Cm got rebase , +.Cm got merge , and .Cm got integrate commands will refuse to run while a histedit operation is in progress.