commit 92228c38cdd5d16ccd0505c2580c3a6dc7e3c10b from: Stefan Sperling date: Sun Jun 02 18:54:14 2019 UTC document preconditions for 'got backout' commit - 5ef14e636366c988d1453d9fb6f4a2b9ff127141 commit + 92228c38cdd5d16ccd0505c2580c3a6dc7e3c10b blob - ccaccdbe1c46e978d4dd5c5c97878cd641408429 blob + 524d8eee79bef0ea730e3b19bbcda19891667168 --- got/got.1 +++ got/got.1 @@ -444,6 +444,13 @@ committed with or discarded again with .Cm got revert . .Pp +.Cm got backout +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 +.Cm got update . +If the work tree already contains files with merge conflicts, these +conflicts must be resolved first. .El .Sh ENVIRONMENT .Bl -tag -width GOT_AUTHOR