Merge master.kernel.org:/pub/scm/gitk/gitk
[git/git.git] / Documentation / git-apply.txt
1 git-apply(1)
2 ============
3 v0.1, June 2005
4
5 NAME
6 ----
7 git-apply - Apply patch on a GIT index file and a work tree
8
9
10 SYNOPSIS
11 --------
12 'git-apply' [--no-merge] [--stat] [--summary] [--check]
13 [--index] [--show-files] [-] [<file>...]
14
15 DESCRIPTION
16 -----------
17 Reads supplied diff output and applies it on a GIT index file
18 and a work tree.
19
20 OPTIONS
21 -------
22 <file>...::
23 The files to read patch from.
24
25 -::
26 Instead of reading from a file, read from standard input.
27
28 --no-merge::
29 The default mode of operation is the merge behaviour
30 which is not quite implemented yet. This flag
31 explicitly tells the program not to use the merge
32 behaviour.
33
34 --stat::
35 Instead of applying the patch, output diffstat for the
36 input.
37
38 --summary::
39 Instead of applying the patch, output a condensed
40 summary of information obtained from git diff extended
41 headers, such as creations, renames and mode changes.
42
43 --check::
44 Instead of applying the patch, see if the patch is
45 applicable to the current work tree and/or the index
46 file and detects errors.
47
48 --index::
49 When --check is in effect, or when applying the patch
50 (which is the default when none of the options that
51 disables it is in effect), make sure the patch is
52 applicable to what the current index file records. If
53 the file to be patched in the work tree is not
54 up-to-date, it is flagged as an error. This flag also
55 causes the index file to be updated.
56
57 --show-files::
58 Show summary of files that are affected by the patch.
59
60
61 Author
62 ------
63 Written by Linus Torvalds <torvalds@osdl.org>
64
65 Documentation
66 --------------
67 Documentation by Junio C Hamano
68
69 GIT
70 ---
71 Part of the link:git.html[git] suite
72