2005-06-22 09:30:17 +00:00
|
|
|
git-apply(1)
|
|
|
|
============
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2005-10-10 23:01:31 +00:00
|
|
|
git-apply - Apply patch on a git index file and a work tree
|
2005-06-22 09:30:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2005-12-31 17:37:15 +00:00
|
|
|
[verse]
|
|
|
|
'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
|
2006-01-31 05:36:24 +00:00
|
|
|
[--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
|
2006-04-10 09:33:06 +00:00
|
|
|
[-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>]
|
2005-12-31 17:37:15 +00:00
|
|
|
[<patch>...]
|
2005-06-22 09:30:17 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2005-10-05 22:08:26 +00:00
|
|
|
Reads supplied diff output and applies it on a git index file
|
2005-06-22 09:30:17 +00:00
|
|
|
and a work tree.
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2005-07-14 03:28:55 +00:00
|
|
|
<patch>...::
|
|
|
|
The files to read patch from. '-' can be used to read
|
|
|
|
from the standard input.
|
2005-06-22 09:30:17 +00:00
|
|
|
|
|
|
|
--stat::
|
|
|
|
Instead of applying the patch, output diffstat for the
|
2005-07-14 03:28:55 +00:00
|
|
|
input. Turns off "apply".
|
2005-06-22 09:30:17 +00:00
|
|
|
|
2005-10-28 09:43:31 +00:00
|
|
|
--numstat::
|
|
|
|
Similar to \--stat, but shows number of added and
|
|
|
|
deleted lines in decimal notation and pathname without
|
|
|
|
abbreviation, to make it more machine friendly. Turns
|
|
|
|
off "apply".
|
|
|
|
|
2005-06-22 09:30:17 +00:00
|
|
|
--summary::
|
|
|
|
Instead of applying the patch, output a condensed
|
|
|
|
summary of information obtained from git diff extended
|
|
|
|
headers, such as creations, renames and mode changes.
|
2005-07-14 03:28:55 +00:00
|
|
|
Turns off "apply".
|
2005-06-22 09:30:17 +00:00
|
|
|
|
|
|
|
--check::
|
|
|
|
Instead of applying the patch, see if the patch is
|
|
|
|
applicable to the current work tree and/or the index
|
2005-07-14 03:28:55 +00:00
|
|
|
file and detects errors. Turns off "apply".
|
2005-06-22 09:30:17 +00:00
|
|
|
|
|
|
|
--index::
|
|
|
|
When --check is in effect, or when applying the patch
|
|
|
|
(which is the default when none of the options that
|
|
|
|
disables it is in effect), make sure the patch is
|
|
|
|
applicable to what the current index file records. If
|
|
|
|
the file to be patched in the work tree is not
|
|
|
|
up-to-date, it is flagged as an error. This flag also
|
|
|
|
causes the index file to be updated.
|
|
|
|
|
2005-10-15 04:56:46 +00:00
|
|
|
--index-info::
|
|
|
|
Newer git-diff output has embedded 'index information'
|
|
|
|
for each blob to help identify the original version that
|
|
|
|
the patch applies to. When this flag is given, and if
|
|
|
|
the original version of the blob is available locally,
|
|
|
|
outputs information about them to the standard output.
|
|
|
|
|
|
|
|
-z::
|
|
|
|
When showing the index information, do not munge paths,
|
|
|
|
but use NUL terminated machine readable format. Without
|
|
|
|
this flag, the pathnames output will have TAB, LF, and
|
|
|
|
backslash characters replaced with `\t`, `\n`, and `\\`,
|
|
|
|
respectively.
|
|
|
|
|
2006-01-31 05:36:24 +00:00
|
|
|
-p<n>::
|
|
|
|
Remove <n> leading slashes from traditional diff paths. The
|
|
|
|
default is 1.
|
|
|
|
|
2006-04-10 09:33:06 +00:00
|
|
|
-C<n>::
|
|
|
|
Ensure at least <n> lines of surrounding context match before
|
|
|
|
and after each change. When fewer lines of surrounding
|
2006-06-07 18:32:33 +00:00
|
|
|
context exist they all must match. By default no context is
|
2006-04-10 09:33:06 +00:00
|
|
|
ever ignored.
|
|
|
|
|
2005-07-14 03:28:55 +00:00
|
|
|
--apply::
|
|
|
|
If you use any of the options marked ``Turns off
|
|
|
|
"apply"'' above, git-apply reads and outputs the
|
|
|
|
information you asked without actually applying the
|
|
|
|
patch. Give this flag after those flags to also apply
|
|
|
|
the patch.
|
|
|
|
|
2005-11-10 04:53:54 +00:00
|
|
|
--no-add::
|
|
|
|
When applying a patch, ignore additions made by the
|
|
|
|
patch. This can be used to extract common part between
|
|
|
|
two files by first running `diff` on them and applying
|
|
|
|
the result with this option, which would apply the
|
|
|
|
deletion part but not addition part.
|
2005-06-22 09:30:17 +00:00
|
|
|
|
2005-11-17 05:32:44 +00:00
|
|
|
--allow-binary-replacement::
|
|
|
|
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
|
|
|
|
the object the patch applies to (i.e. "index" line's
|
|
|
|
pre-image object name is what is in the working tree),
|
|
|
|
and the post-image object is available in the object
|
|
|
|
database, use the post-image object as the patch
|
|
|
|
result. This allows binary files to be patched in a
|
|
|
|
very limited way.
|
|
|
|
|
2006-03-02 08:45:48 +00:00
|
|
|
--whitespace=<option>::
|
|
|
|
When applying a patch, detect a new or modified line
|
|
|
|
that ends with trailing whitespaces (this includes a
|
|
|
|
line that solely consists of whitespaces). By default,
|
|
|
|
the command outputs warning messages and applies the
|
|
|
|
patch.
|
|
|
|
When `git-apply` is used for statistics and not applying a
|
|
|
|
patch, it defaults to `nowarn`.
|
|
|
|
You can use different `<option>` to control this
|
2006-06-03 20:27:26 +00:00
|
|
|
behavior:
|
2006-03-02 08:45:48 +00:00
|
|
|
+
|
|
|
|
* `nowarn` turns off the trailing whitespace warning.
|
|
|
|
* `warn` outputs warnings for a few such errors, but applies the
|
|
|
|
patch (default).
|
|
|
|
* `error` outputs warnings for a few such errors, and refuses
|
|
|
|
to apply the patch.
|
|
|
|
* `error-all` is similar to `error` but shows all errors.
|
|
|
|
* `strip` outputs warnings for a few such errors, strips out the
|
|
|
|
trailing whitespaces and applies the patch.
|
|
|
|
|
|
|
|
|
|
|
|
Configuration
|
|
|
|
-------------
|
|
|
|
|
|
|
|
apply.whitespace::
|
|
|
|
When no `--whitespace` flag is given from the command
|
|
|
|
line, this configuration item is used as the default.
|
|
|
|
|
|
|
|
|
2005-06-22 09:30:17 +00:00
|
|
|
Author
|
|
|
|
------
|
|
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by Junio C Hamano
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2005-09-19 10:10:51 +00:00
|
|
|
Part of the gitlink:git[7] suite
|
2005-06-22 09:30:17 +00:00
|
|
|
|