diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-13 07:45:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-13 07:45:12 +0000 |
| commit | 54559c8b9d844fcbb8510673984390f766841b72 (patch) | |
| tree | be3d52526f263979e0da2c214499b4397b80f628 /git-apply.html | |
| parent | a8adb1ec550d7d7a66cd4d362cfbd01795d71f43 (diff) | |
| download | git-htmldocs-54559c8b9d844fcbb8510673984390f766841b72.tar.gz | |
Autogenerated HTML docs for v1.3.0-rc3-gd53352
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html index e809b6e11..497d5636f 100644 --- a/git-apply.html +++ b/git-apply.html @@ -275,7 +275,7 @@ git-apply(1) Manual Page <div class="verseblock">
<div class="content"><em>git-apply</em> [--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>…]</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -384,6 +384,17 @@ and a work tree.</p> </p>
</dd>
<dt>
+-C<n>
+</dt>
+<dd>
+<p>
+ 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.
+</p>
+</dd>
+<dt>
--apply
</dt>
<dd>
@@ -499,7 +510,7 @@ apply.whitespace </div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Mar-2006 09:14:48 UTC
+Last updated 13-Apr-2006 07:45:00 UTC
</div>
</div>
</body>
|