X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-apply.txt;h=9cc7c74deab0251eba8e34daf2b3c718071bedfd;hb=f0a85daaf3d624dcf841cad8d5d243e6da55ea70;hp=1c64a1aa82648db90251816f1b75dbdc9e7186e3;hpb=5f32776d3bc48bfda61e2d0586d920bc3baf4b16;p=git.git

diff --git a/git-apply.txt b/git-apply.txt
index 1c64a1aa..9cc7c74d 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
 	  [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
-	  [--whitespace=<nowarn|warn|error|error-all|strip>]
+	  [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>]
 	  [<patch>...]
 
 DESCRIPTION
@@ -73,6 +73,12 @@ OPTIONS
 	Remove <n> leading slashes from traditional diff paths. The
 	default is 1.
 
+-C<n>::
+	Ensure at least <n> lines of surrounding context match before
+	and after each change.  When fewer lines of surrounding
+	context exist they all most match.  By default no context is
+	ever ignored.
+
 --apply::
 	If you use any of the options marked ``Turns off
 	"apply"'' above, git-apply reads and outputs the
@@ -107,7 +113,7 @@ OPTIONS
 	When `git-apply` is used for statistics and not applying a
 	patch, it defaults to `nowarn`.
 	You can use different `<option>` to control this
-	behaviour:
+	behavior:
 +
 * `nowarn` turns off the trailing whitespace warning.
 * `warn` outputs warnings for a few such errors, but applies the