From: Junio C Hamano Date: Sat, 28 Feb 2009 22:05:09 +0000 (-0800) Subject: Merge branch 'maint-1.6.0' into maint X-Git-Tag: v1.6.2~11^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/325e9bca373349c028a72a796ebcff0732092759?ds=inline;hp=-c Merge branch 'maint-1.6.0' into maint * maint-1.6.0: added missing backtick in git-apply.txt --- 325e9bca373349c028a72a796ebcff0732092759 diff --combined Documentation/git-apply.txt index e726510ab1,44e1968a1c..32f2b85a10 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@@ -14,8 -14,7 +14,8 @@@ SYNOPSI [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=] - [--exclude=PATH] [--directory=] [--verbose] [...] + [--exclude=PATH] [--include=PATH] [--directory=] + [--verbose] [...] DESCRIPTION ----------- @@@ -138,17 -137,6 +138,17 @@@ discouraged be useful when importing patchsets, where you want to exclude certain files or directories. +--include=:: + 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=:: When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is @@@ -159,7 -147,7 +159,7 @@@ considered whitespace errors. + By default, the command outputs warning messages but applies the patch. - When `git-apply is used for statistics and not applying a + When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`. + You can use different `` to control this