summaryrefslogtreecommitdiff
path: root/sys/man/1/patch
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2022-08-16 23:50:28 +0000
committerOri Bernstein <ori@eigenstate.org>2022-08-16 23:50:28 +0000
commitd86a7ed412555192e2000a9a34b3372f380ec3d0 (patch)
tree3a6440f1f5731ea8ccd5b11469145ccf21f22f9b /sys/man/1/patch
parent3839ad4d3c9b26b8a5d564d1d8f09490799e4cd7 (diff)
git/rebase: allow rebase without a clean tree
Here, patch grows a dry run option (-n), which allows git/import to bail out early if it would patch files that are dirty in tree. Once git/import refuses to patch dirty files, git/rebase can skip checking if the whole tree is clean, which is both convenient and much faster on large trees.
Diffstat (limited to 'sys/man/1/patch')
-rw-r--r--sys/man/1/patch3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/man/1/patch b/sys/man/1/patch
index 9178d0c02..543885ffd 100644
--- a/sys/man/1/patch
+++ b/sys/man/1/patch
@@ -28,6 +28,9 @@ The following options are supported:
Reverse direction of the patch. Additions become removals,
and the new and old file names are swapped.
.TP
+.B -n
+Print the files that would be modified by this patch, but do not apply it.
+.TP
.BI -p \ nstrip
Remove the prefix containing
.I nstrip