]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-diff(1) |
2 | =========== | |
7fc9d69f JH |
3 | |
4 | NAME | |
5 | ---- | |
7bd7f280 | 6 | git-diff - Show changes between commits, commit and working tree, etc |
7fc9d69f JH |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
49bd56a5 | 11 | [verse] |
de613050 RD |
12 | 'git diff' [<options>] [<commit>] [--] [<path>...] |
13 | 'git diff' [<options>] --cached [<commit>] [--] [<path>...] | |
b7e10b2c CT |
14 | 'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...] |
15 | 'git diff' [<options>] <commit>...<commit> [--] [<path>...] | |
de613050 RD |
16 | 'git diff' [<options>] <blob> <blob> |
17 | 'git diff' [<options>] --no-index [--] <path> <path> | |
7fc9d69f JH |
18 | |
19 | DESCRIPTION | |
20 | ----------- | |
49bd56a5 | 21 | Show changes between the working tree and the index or a tree, changes |
b7e10b2c CT |
22 | between the index and a tree, changes between two trees, changes resulting |
23 | from a merge, changes between two blob objects, or changes between two | |
24 | files on disk. | |
35ef3a4c | 25 | |
de613050 | 26 | 'git diff' [<options>] [--] [<path>...]:: |
dfa2f22f | 27 | |
f5e6b89b JH |
28 | This form is to view the changes you made relative to |
29 | the index (staging area for the next commit). In other | |
2de9b711 | 30 | words, the differences are what you _could_ tell Git to |
f5e6b89b | 31 | further add to the index but you still haven't. You can |
5162e697 | 32 | stage these changes by using linkgit:git-add[1]. |
286bc123 | 33 | |
de613050 | 34 | 'git diff' [<options>] --no-index [--] <path> <path>:: |
286bc123 JH |
35 | |
36 | This form is to compare the given two paths on the | |
37 | filesystem. You can omit the `--no-index` option when | |
38 | running the command in a working tree controlled by Git and | |
39 | at least one of the paths points outside the working tree, | |
40 | or when running the command outside a working tree | |
0115e5d9 | 41 | controlled by Git. This form implies `--exit-code`. |
d516c2d1 | 42 | |
de613050 | 43 | 'git diff' [<options>] --cached [<commit>] [--] [<path>...]:: |
f5e6b89b JH |
44 | |
45 | This form is to view the changes you staged for the next | |
ce054545 | 46 | commit relative to the named <commit>. Typically you |
f5e6b89b JH |
47 | would want comparison with the latest commit, so if you |
48 | do not give <commit>, it defaults to HEAD. | |
5fe8f49b | 49 | If HEAD does not exist (e.g. unborn branches) and |
a2b7a3b3 | 50 | <commit> is not given, it shows all staged changes. |
2baf1850 | 51 | --staged is a synonym of --cached. |
f5e6b89b | 52 | |
de613050 | 53 | 'git diff' [<options>] <commit> [--] [<path>...]:: |
f5e6b89b JH |
54 | |
55 | This form is to view the changes you have in your | |
56 | working tree relative to the named <commit>. You can | |
57 | use HEAD to compare it with the latest commit, or a | |
58 | branch name to compare with the tip of a different | |
59 | branch. | |
60 | ||
de613050 | 61 | 'git diff' [<options>] <commit> <commit> [--] [<path>...]:: |
f5e6b89b | 62 | |
2b9232cc MH |
63 | This is to view the changes between two arbitrary |
64 | <commit>. | |
65 | ||
bc5482e9 | 66 | 'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]:: |
b7e10b2c CT |
67 | |
68 | This form is to view the results of a merge commit. The first | |
69 | listed <commit> must be the merge itself; the remaining two or | |
70 | more commits should be its parents. A convenient way to produce | |
71 | the desired set of revisions is to use the {caret}@ suffix. | |
72 | For instance, if `master` names a merge commit, `git diff master | |
73 | master^@` gives the same combined diff as `git show master`. | |
74 | ||
78b76d31 MÅ |
75 | 'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: |
76 | ||
77 | This is synonymous to the earlier form (without the "..") for | |
78 | viewing the changes between two arbitrary <commit>. If <commit> on | |
79 | one side is omitted, it will have the same effect as | |
80 | using HEAD instead. | |
81 | ||
de613050 | 82 | 'git diff' [<options>] <commit>\...<commit> [--] [<path>...]:: |
2b9232cc MH |
83 | |
84 | This form is to view the changes on the branch containing | |
85 | and up to the second <commit>, starting at a common ancestor | |
b1889c36 | 86 | of both <commit>. "git diff A\...B" is equivalent to |
ca8ed443 | 87 | "git diff $(git merge-base A B) B". You can omit any one |
2b9232cc | 88 | of <commit>, which has the same effect as using HEAD instead. |
f5e6b89b | 89 | |
ca8ed443 | 90 | Just in case you are doing something exotic, it should be |
0c783f66 | 91 | noted that all of the <commit> in the above description, except |
ed84e6d5 | 92 | in the last two forms that use ".." notations, can be any |
bd52900d | 93 | <tree>. |
dfa2f22f | 94 | |
41a5564e | 95 | For a more complete list of ways to spell <commit>, see |
9d83e382 | 96 | "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. |
2b9232cc MH |
97 | However, "diff" is about comparing two _endpoints_, not ranges, |
98 | and the range notations ("<commit>..<commit>" and | |
0c783f66 | 99 | "<commit>\...<commit>") do not mean a range as defined in the |
9d83e382 | 100 | "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. |
7fc9d69f | 101 | |
de613050 | 102 | 'git diff' [<options>] <blob> <blob>:: |
d7747bd5 KB |
103 | |
104 | This form is to view the differences between the raw | |
105 | contents of two blob objects. | |
106 | ||
7fc9d69f JH |
107 | OPTIONS |
108 | ------- | |
c1a95fa6 | 109 | :git-diff: 1 |
f5e6b89b | 110 | include::diff-options.txt[] |
35ef3a4c | 111 | |
47242cd1 AH |
112 | -1 --base:: |
113 | -2 --ours:: | |
114 | -3 --theirs:: | |
115 | Compare the working tree with the "base" version (stage #1), | |
116 | "our branch" (stage #2) or "their branch" (stage #3). The | |
117 | index contains these stages only for unmerged entries i.e. | |
118 | while resolving conflicts. See linkgit:git-read-tree[1] | |
119 | section "3-Way Merge" for detailed information. | |
120 | ||
121 | -0:: | |
122 | Omit diff output for unmerged entries and just show | |
123 | "Unmerged". Can be used only when comparing the working tree | |
124 | with the index. | |
125 | ||
35ef3a4c | 126 | <path>...:: |
f5e6b89b JH |
127 | The <paths> parameters, when given, are used to limit |
128 | the diff to the named paths (you can give directory | |
129 | names and get diff for all files under them). | |
7fc9d69f | 130 | |
f552e51e | 131 | |
9e6c7230 | 132 | include::diff-format.txt[] |
7fc9d69f | 133 | |
803f498c JH |
134 | EXAMPLES |
135 | -------- | |
136 | ||
137 | Various ways to check your working tree:: | |
138 | + | |
139 | ------------ | |
48aeecdc | 140 | $ git diff <1> |
f2dd1c9a | 141 | $ git diff --cached <2> |
48aeecdc SE |
142 | $ git diff HEAD <3> |
143 | ------------ | |
144 | + | |
434e6ef8 SH |
145 | <1> Changes in the working tree not yet staged for the next commit. |
146 | <2> Changes between the index and your last commit; what you | |
ba170517 | 147 | would be committing if you run "git commit" without "-a" option. |
434e6ef8 | 148 | <3> Changes in the working tree since your last commit; what you |
ba170517 | 149 | would be committing if you run "git commit -a" |
803f498c JH |
150 | |
151 | Comparing with arbitrary commits:: | |
152 | + | |
153 | ------------ | |
48aeecdc SE |
154 | $ git diff test <1> |
155 | $ git diff HEAD -- ./test <2> | |
156 | $ git diff HEAD^ HEAD <3> | |
157 | ------------ | |
158 | + | |
434e6ef8 | 159 | <1> Instead of using the tip of the current branch, compare with the |
ba170517 | 160 | tip of "test" branch. |
434e6ef8 | 161 | <2> Instead of comparing with the tip of "test" branch, compare with |
ba170517 JNA |
162 | the tip of the current branch, but limit the comparison to the |
163 | file "test". | |
434e6ef8 | 164 | <3> Compare the version before the last commit and the last commit. |
803f498c | 165 | |
2b9232cc MH |
166 | Comparing branches:: |
167 | + | |
168 | ------------ | |
169 | $ git diff topic master <1> | |
170 | $ git diff topic..master <2> | |
171 | $ git diff topic...master <3> | |
172 | ------------ | |
173 | + | |
174 | <1> Changes between the tips of the topic and the master branches. | |
175 | <2> Same as above. | |
06ada152 | 176 | <3> Changes that occurred on the master branch since when the topic |
ba170517 | 177 | branch was started off it. |
803f498c JH |
178 | |
179 | Limiting the diff output:: | |
180 | + | |
181 | ------------ | |
48aeecdc | 182 | $ git diff --diff-filter=MRC <1> |
90ae710e | 183 | $ git diff --name-status <2> |
48aeecdc SE |
184 | $ git diff arch/i386 include/asm-i386 <3> |
185 | ------------ | |
186 | + | |
a58088ab | 187 | <1> Show only modification, rename, and copy, but not addition |
ba170517 | 188 | or deletion. |
434e6ef8 | 189 | <2> Show only names and the nature of change, but not actual |
ba170517 | 190 | diff output. |
434e6ef8 | 191 | <3> Limit diff output to named subtrees. |
803f498c JH |
192 | |
193 | Munging the diff output:: | |
194 | + | |
195 | ------------ | |
48aeecdc SE |
196 | $ git diff --find-copies-harder -B -C <1> |
197 | $ git diff -R <2> | |
198 | ------------ | |
199 | + | |
434e6ef8 | 200 | <1> Spend extra cycles to find renames, copies and complete |
ba170517 | 201 | rewrites (very expensive). |
434e6ef8 | 202 | <2> Output diff in reverse. |
803f498c | 203 | |
3bdfd443 DA |
204 | SEE ALSO |
205 | -------- | |
b77134b0 JN |
206 | diff(1), |
207 | linkgit:git-difftool[1], | |
208 | linkgit:git-log[1], | |
209 | linkgit:gitdiffcore[7], | |
210 | linkgit:git-format-patch[1], | |
b7e10b2c CT |
211 | linkgit:git-apply[1], |
212 | linkgit:git-show[1] | |
803f498c | 213 | |
7fc9d69f JH |
214 | GIT |
215 | --- | |
9e1f0a85 | 216 | Part of the linkgit:git[1] suite |