1git-apply(1) 2============ 3 4NAME 5---- 6git-apply - Apply patch on a git index file and a work tree 7 8 9SYNOPSIS 10-------- 11[verse] 12'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] 13 [--no-add] [--index-info] [--allow-binary-replacement | --binary] 14 [-R | --reverse] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] 15 [--whitespace=<nowarn|warn|error|error-all|strip>] [--exclude=PATH] 16 [--cached] [--verbose] [<patch>...] 17 18DESCRIPTION 19----------- 20Reads supplied diff output and applies it on a git index file 21and a work tree. 22 23OPTIONS 24------- 25<patch>...:: 26 The files to read patch from. '-' can be used to read 27 from the standard input. 28 29--stat:: 30 Instead of applying the patch, output diffstat for the 31 input. Turns off "apply". 32 33--numstat:: 34 Similar to \--stat, but shows number of added and 35 deleted lines in decimal notation and pathname without 36 abbreviation, to make it more machine friendly. Turns 37 off "apply". 38 39--summary:: 40 Instead of applying the patch, output a condensed 41 summary of information obtained from git diff extended 42 headers, such as creations, renames and mode changes. 43 Turns off "apply". 44 45--check:: 46 Instead of applying the patch, see if the patch is 47 applicable to the current work tree and/or the index 48 file and detects errors. Turns off "apply". 49 50--index:: 51 When --check is in effect, or when applying the patch 52 (which is the default when none of the options that 53 disables it is in effect), make sure the patch is 54 applicable to what the current index file records. If 55 the file to be patched in the work tree is not 56 up-to-date, it is flagged as an error. This flag also 57 causes the index file to be updated. 58 59--cached:: 60 Apply a patch without touching the working tree. Instead, take the 61 cached data, apply the patch, and store the result in the index, 62 without using the working tree. This implies '--index'. 63 64--index-info:: 65 Newer git-diff output has embedded 'index information' 66 for each blob to help identify the original version that 67 the patch applies to. When this flag is given, and if 68 the original version of the blob is available locally, 69 outputs information about them to the standard output. 70 71-R, --reverse:: 72 Apply the patch in reverse. 73 74--reject:: 75 For atomicity, gitlink:git-apply[1] by default fails the whole patch and 76 does not touch the working tree when some of the hunks 77 do not apply. This option makes it apply 78 the parts of the patch that are applicable, and leave the 79 rejected hunks in corresponding *.rej files. 80 81-z:: 82 When showing the index information, do not munge paths, 83 but use NUL terminated machine readable format. Without 84 this flag, the pathnames output will have TAB, LF, and 85 backslash characters replaced with `\t`, `\n`, and `\\`, 86 respectively. 87 88-p<n>:: 89 Remove <n> leading slashes from traditional diff paths. The 90 default is 1. 91 92-C<n>:: 93 Ensure at least <n> lines of surrounding context match before 94 and after each change. When fewer lines of surrounding 95 context exist they all must match. By default no context is 96 ever ignored. 97 98--apply:: 99 If you use any of the options marked "Turns off 100 'apply'" above, gitlink:git-apply[1] reads and outputs the 101 information you asked without actually applying the 102 patch. Give this flag after those flags to also apply 103 the patch. 104 105--no-add:: 106 When applying a patch, ignore additions made by the 107 patch. This can be used to extract common part between 108 two files by first running `diff` on them and applying 109 the result with this option, which would apply the 110 deletion part but not addition part. 111 112--allow-binary-replacement, --binary:: 113 Historically we did not allow binary patch applied 114 without an explicit permission from the user, and this 115 flag was the way to do so. Currently we always allow binary 116 patch application, so this is a no-op. 117 118--exclude=<path-pattern>:: 119 Don't apply changes to files matching the given path pattern. This can 120 be useful when importing patchsets, where you want to exclude certain 121 files or directories. 122 123--whitespace=<option>:: 124 When applying a patch, detect a new or modified line 125 that ends with trailing whitespaces (this includes a 126 line that solely consists of whitespaces). By default, 127 the command outputs warning messages and applies the 128 patch. 129 When gitlink:git-apply[1] is used for statistics and not applying a 130 patch, it defaults to `nowarn`. 131 You can use different `<option>` to control this 132 behavior: 133+ 134* `nowarn` turns off the trailing whitespace warning. 135* `warn` outputs warnings for a few such errors, but applies the 136 patch (default). 137* `error` outputs warnings for a few such errors, and refuses 138 to apply the patch. 139* `error-all` is similar to `error` but shows all errors. 140* `strip` outputs warnings for a few such errors, strips out the 141 trailing whitespaces and applies the patch. 142 143--inacurate-eof:: 144 Under certain circumstances, some versions of diff do not correctly 145 detect a missing new-line at the end of the file. As a result, patches 146 created by such diff programs do not record incomplete lines 147 correctly. This option adds support for applying such patches by 148 working around this bug. 149 150--verbose:: 151 Report progress to stderr. By default, only a message about the 152 current patch being applied will be printed. This option will cause 153 additional information to be reported. 154 155Configuration 156------------- 157 158apply.whitespace:: 159 When no `--whitespace` flag is given from the command 160 line, this configuration item is used as the default. 161 162 163Author 164------ 165Written by Linus Torvalds <torvalds@osdl.org> 166 167Documentation 168-------------- 169Documentation by Junio C Hamano 170 171GIT 172--- 173Part of the gitlink:git[7] suite 174