projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement limited context matching in git-apply.
[git.git]
/
Documentation
/
git-apply.txt
diff --git
a/Documentation/git-apply.txt
b/Documentation/git-apply.txt
index
1c64a1a
..
e93ea1f
100644
(file)
--- 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]
[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
[<patch>...]
DESCRIPTION
@@
-73,6
+73,12
@@
OPTIONS
Remove <n> leading slashes from traditional diff paths. The
default is 1.
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
--apply::
If you use any of the options marked ``Turns off
"apply"'' above, git-apply reads and outputs the