diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-10 19:45:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-10 19:45:30 -0700 |
| commit | 8fcd4218c63d15481d8fbb12c3fddfffa98e1adc (patch) | |
| tree | 48861ca4e26905814119020e41beb0aff6342cab /Documentation | |
| parent | 6b32ee2381deb414378a76cae213a4fe633f8fcc (diff) | |
| parent | 474958871394365ee7807d88217c3d75269161a6 (diff) | |
| download | git-8fcd4218c63d15481d8fbb12c3fddfffa98e1adc.tar.gz | |
Merge branch 'eb/apply' into next
* eb/apply:
Implement limited context matching in git-apply.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 1c64a1aa82..e93ea1f265 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=<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 |