summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
blob: 81eb155af6d75cd3f82ffca3103bb197ed8fe37b (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
git-apply(1)
============
v0.1, June 2005
 
NAME
----
git-apply - Apply patch on a GIT index file and a work tree
 
 
SYNOPSIS
--------
'git-apply' [--no-merge] [--stat] [--summary] [--check]
[--index] [--show-files] [-] [<file>...]
 
DESCRIPTION
-----------
Reads supplied diff output and applies it on a GIT index file
and a work tree.
 
OPTIONS
-------
<file>...::
	The files to read patch from.
 
-::
	Instead of reading from a file, read from standard input.
 
--no-merge::
	The default mode of operation is the merge behaviour
	which is not quite implemented yet.  This flag
	explicitly tells the program not to use the merge
	behaviour.
 
--stat::
	Instead of applying the patch, output diffstat for the
	input.
 
--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.
 
--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.
 
--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.
 
--show-files::
	Show summary of files that are affected by the patch.
 
 
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
 
Documentation
--------------
Documentation by Junio C Hamano
 
GIT
---
Part of the link:git.html[git] suite