summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
blob: fd38ee5b193bdc9b219ea43953fb8524195e4d2a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
git-apply(1)
============
 
NAME
----
git-apply - Apply patch on a git index file and a work tree
 
 
SYNOPSIS
--------
'git-apply' [--stat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...]
 
DESCRIPTION
-----------
Reads supplied diff output and applies it on a git index file
and a work tree.
 
OPTIONS
-------
<patch>...::
	The files to read patch from.  '-' can be used to read
	from the standard input.
 
--stat::
	Instead of applying the patch, output diffstat for the
	input.  Turns off "apply".
 
--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.
	Turns off "apply".
 
--check::
	Instead of applying the patch, see if the patch is
	applicable to the current work tree and/or the index
	file and detects errors.  Turns off "apply".
 
--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.
 
--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.
 
--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.
 
 
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
 
Documentation
--------------
Documentation by Junio C Hamano
 
GIT
---
Part of the gitlink:git[7] suite