diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 09:09:41 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 09:09:41 -0700 |
| commit | 81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb (patch) | |
| tree | 34d4650de9c5aa37cf9a2d23688dfe99ff52fd76 /Documentation | |
| parent | Merge branch 'jc/safe-c-l-d' (diff) | |
| parent | git-apply:--include=pathspec (diff) | |
| download | tgif-81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb.tar.xz | |
Merge branch 'jc/apply-include-exclude'
* jc/apply-include-exclude:
git-apply:--include=pathspec
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index feb51f124a..e726510ab1 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -14,7 +14,8 @@ SYNOPSIS [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=<nowarn|warn|fix|error|error-all>] - [--exclude=PATH] [--directory=<root>] [--verbose] [<patch>...] + [--exclude=PATH] [--include=PATH] [--directory=<root>] + [--verbose] [<patch>...] DESCRIPTION ----------- @@ -137,6 +138,17 @@ discouraged. be useful when importing patchsets, where you want to exclude certain files or directories. +--include=<path-pattern>:: + Apply changes to files matching the given path pattern. This can + be useful when importing patchsets, where you want to include certain + files or directories. ++ +When --exclude and --include patterns are used, they are examined in the +order they appear on the command line, and the first match determines if a +patch to each path is used. A patch to a path that does not match any +include/exclude pattern is used by default if there is no include pattern +on the command line, and ignored if there is any include pattern. + --whitespace=<action>:: When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is |