Commit 750a309349d99384187d53c0436ec4b404c1a112
2022-03-13T18:32:04
some man page tweaks for 'got patch' ok op@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/got/got.1 b/got/got.1
index 191ae2e..f0d5878 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1289,31 +1289,38 @@ option)
.Dl Pq alias: Cm pa
Apply changes from
.Ar patchfile
-.Pq or standard input
-that must be a unified diff.
-If
+to files in a work tree.
+.Pp
+The patch must be in the unified diff format as produced by
+.Cm got diff ,
+or
+.Xr diff 1
+when invoked with the
+.Fl u
+option.
+.Pp
+If no
.Ar patchfile
-contains more than one patch,
-.Nm
-.Cm patch
-will try to apply each of them in sequence.
-Files added or removed by the patch scheduled for addition or removal in
+argument is provided, read unified diff data from standard input instead.
+.Pp
+If the
+.Ar patchfile
+contains multiple patches then attempt to apply each of them in sequence.
+Files added or removed by a patch will be scheduled for addition or removal in
the work tree.
.Pp
While applying the
.Ar patchfile ,
show the status of each affected file, using the following status codes:
.Bl -column XYZ description
-.It M Ta modified file
-.It D Ta deleted file
-.It A Ta added file
+.It M Ta file was modified
+.It D Ta file was deleted
+.It A Ta file was added
.El
.Pp
-If a change does not match at its exact line number,
-.Nm
-.Cm patch
-applies it somewhere else in the file if it can find a good spot before
-giving up.
+If a change does not match at its exact line number, attempt to
+apply it somewhere else in the file if a good spot can be found,
+before giving up.
.Pp
.Nm
.Cm patch
@@ -1321,14 +1328,14 @@ will refuse to apply a patch if certain preconditions are not met.
Files to be deleted must be present in the work tree and not have been
scheduled for deletion already.
Files to be added must be unknown and not present in the work tree.
-Files to be modified must be already present in the the work tree and
-not have conflicts or being obstructed.
+Files to be modified must be already be present in the work tree and
+not contain conflicts or be obstructed.
.Pp
If an error occurs, the
.Cm patch
operation will be aborted.
Any changes made to the work tree up to this point will be left behind.
-Such cahnges can be viewed with
+Such changes can be viewed with
.Cm got diff
and can be reverted with
.Cm got revert