Commit 92228c38cdd5d16ccd0505c2580c3a6dc7e3c10b

Stefan Sperling 2019-06-02T20:54:14

document preconditions for 'got backout'

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff --git a/got/got.1 b/got/got.1
index ccaccdb..524d8ee 100644
--- a/got/got.1
+++ b/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