From: Junio C Hamano Date: Mon, 28 Aug 2006 00:51:05 +0000 (-0700) Subject: Merge branch 'jc/apply' X-Git-Tag: v1.4.3-rc1~176 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd?hp=-c Merge branch 'jc/apply' * jc/apply: git-apply --reject: finishing touches. apply --reject: count hunks starting from 1, not 0 git-apply --verbose git-apply --reject: send rejects to .rej files. git-apply --reject apply --reverse: tie it all together. diff.c: make binary patch reversible. builtin-apply --reverse: two bugfixes. --- b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd diff --combined Documentation/git-apply.txt index 20e12ceda0,2e2acd72c7..c76cfffdc6 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@@ -10,10 -10,10 +10,10 @@@ SYNOPSI -------- [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] - [--no-add] [--index-info] [--allow-binary-replacement] - [--reverse] [--reject] [-z] [-pNUM] - [-CNUM] [--whitespace=] - [...] + [--no-add] [--index-info] [--allow-binary-replacement | --binary] + [-R | --reverse] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] + [--whitespace=] [--exclude=PATH] + [--cached] [--verbose] [...] DESCRIPTION ----------- @@@ -56,11 -56,6 +56,11 @@@ OPTION up-to-date, it is flagged as an error. This flag also causes the index file to be updated. +--cached:: + Apply a patch without touching the working tree. Instead, take the + cached data, apply the patch, and store the result in the index, + without using the working tree. This implies '--index'. + --index-info:: Newer git-diff output has embedded 'index information' for each blob to help identify the original version that @@@ -68,15 -63,15 +68,15 @@@ the original version of the blob is available locally, outputs information about them to the standard output. ---reverse:: +-R, --reverse:: Apply the patch in reverse. --reject:: - For atomicity, `git apply` fails the whole patch and + For atomicity, gitlink:git-apply[1] by default fails the whole patch and does not touch the working tree when some of the hunks - do not apply by default. This option makes it apply - parts of the patch that are applicable, and leave the + do not apply. This option makes it apply - the parts of the patch that are applicable, and send the - rejected hunks to the standard output of the command. ++ the parts of the patch that are applicable, and leave the + rejected hunks in corresponding *.rej files. -z:: When showing the index information, do not munge paths, @@@ -96,8 -91,8 +96,8 @@@ ever ignored. --apply:: - If you use any of the options marked ``Turns off - "apply"'' above, git-apply reads and outputs the + If you use any of the options marked "Turns off + 'apply'" above, gitlink:git-apply[1] reads and outputs the information you asked without actually applying the patch. Give this flag after those flags to also apply the patch. @@@ -109,7 -104,7 +109,7 @@@ the result with this option, which would apply the deletion part but not addition part. ---allow-binary-replacement:: +--allow-binary-replacement, --binary:: When applying a patch, which is a git-enhanced patch that was prepared to record the pre- and post-image object name in full, and the path being patched exactly matches @@@ -120,18 -115,13 +120,18 @@@ result. This allows binary files to be patched in a very limited way. +--exclude=:: + Don't apply changes to files matching the given path pattern. This can + be useful when importing patchsets, where you want to exclude certain + files or directories. + --whitespace=