X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=e93ea1f26554f99e9dee532e0fa585309ae43110;hb=a3cc31fb059410d6b96786045947bafc2f32ce60;hp=1c64a1aa82648db90251816f1b75dbdc9e7186e3;hpb=262cc77dab3d899193f222230f03e11b37c604cb;p=git.git diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 1c64a1aa..e93ea1f2 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/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=] + [-CNUM] [--whitespace=] [...] DESCRIPTION @@ -73,6 +73,12 @@ OPTIONS Remove leading slashes from traditional diff paths. The default is 1. +-C:: + Ensure at least 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