]>
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 | 12 | 'git diff' [<options>] [<commit>] [--] [<path>...] |
0f5a1d44 | 13 | 'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] |
3d09c228 | 14 | 'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] |
b7e10b2c | 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 | |
0f5a1d44 | 43 | 'git diff' [<options>] --cached [--merge-base] [<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. |
0f5a1d44 DL |
52 | + |
53 | If --merge-base is given, instead of using <commit>, use the merge base | |
eb448631 DL |
54 | of <commit> and HEAD. `git diff --cached --merge-base A` is equivalent to |
55 | `git diff --cached $(git merge-base A HEAD)`. | |
f5e6b89b | 56 | |
eb448631 | 57 | 'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]:: |
f5e6b89b JH |
58 | |
59 | This form is to view the changes you have in your | |
60 | working tree relative to the named <commit>. You can | |
61 | use HEAD to compare it with the latest commit, or a | |
62 | branch name to compare with the tip of a different | |
63 | branch. | |
eb448631 DL |
64 | + |
65 | If --merge-base is given, instead of using <commit>, use the merge base | |
66 | of <commit> and HEAD. `git diff --merge-base A` is equivalent to | |
67 | `git diff $(git merge-base A HEAD)`. | |
f5e6b89b | 68 | |
3d09c228 | 69 | 'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]:: |
f5e6b89b | 70 | |
2b9232cc MH |
71 | This is to view the changes between two arbitrary |
72 | <commit>. | |
3d09c228 DL |
73 | + |
74 | If --merge-base is given, use the merge base of the two commits for the | |
75 | "before" side. `git diff --merge-base A B` is equivalent to | |
76 | `git diff $(git merge-base A B) B`. | |
2b9232cc | 77 | |
bc5482e9 | 78 | 'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]:: |
b7e10b2c CT |
79 | |
80 | This form is to view the results of a merge commit. The first | |
81 | listed <commit> must be the merge itself; the remaining two or | |
82 | more commits should be its parents. A convenient way to produce | |
a8fa6a08 | 83 | the desired set of revisions is to use the `^@` suffix. |
b7e10b2c CT |
84 | For instance, if `master` names a merge commit, `git diff master |
85 | master^@` gives the same combined diff as `git show master`. | |
86 | ||
78b76d31 MÅ |
87 | 'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: |
88 | ||
a8fa6a08 | 89 | This is synonymous to the earlier form (without the `..`) for |
78b76d31 MÅ |
90 | viewing the changes between two arbitrary <commit>. If <commit> on |
91 | one side is omitted, it will have the same effect as | |
92 | using HEAD instead. | |
93 | ||
de613050 | 94 | 'git diff' [<options>] <commit>\...<commit> [--] [<path>...]:: |
2b9232cc MH |
95 | |
96 | This form is to view the changes on the branch containing | |
97 | and up to the second <commit>, starting at a common ancestor | |
a8fa6a08 DL |
98 | of both <commit>. `git diff A...B` is equivalent to |
99 | `git diff $(git merge-base A B) B`. You can omit any one | |
2b9232cc | 100 | of <commit>, which has the same effect as using HEAD instead. |
f5e6b89b | 101 | |
ca8ed443 | 102 | Just in case you are doing something exotic, it should be |
0c783f66 | 103 | noted that all of the <commit> in the above description, except |
0f5a1d44 DL |
104 | in the `--merge-base` case and in the last two forms that use `..` |
105 | notations, can be any <tree>. | |
dfa2f22f | 106 | |
41a5564e | 107 | For a more complete list of ways to spell <commit>, see |
9d83e382 | 108 | "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. |
2b9232cc | 109 | However, "diff" is about comparing two _endpoints_, not ranges, |
a8fa6a08 DL |
110 | and the range notations (`<commit>..<commit>` and |
111 | `<commit>...<commit>`) do not mean a range as defined in the | |
9d83e382 | 112 | "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. |
7fc9d69f | 113 | |
de613050 | 114 | 'git diff' [<options>] <blob> <blob>:: |
d7747bd5 KB |
115 | |
116 | This form is to view the differences between the raw | |
117 | contents of two blob objects. | |
118 | ||
7fc9d69f JH |
119 | OPTIONS |
120 | ------- | |
c1a95fa6 | 121 | :git-diff: 1 |
f5e6b89b | 122 | include::diff-options.txt[] |
35ef3a4c | 123 | |
47242cd1 AH |
124 | -1 --base:: |
125 | -2 --ours:: | |
126 | -3 --theirs:: | |
127 | Compare the working tree with the "base" version (stage #1), | |
128 | "our branch" (stage #2) or "their branch" (stage #3). The | |
129 | index contains these stages only for unmerged entries i.e. | |
130 | while resolving conflicts. See linkgit:git-read-tree[1] | |
131 | section "3-Way Merge" for detailed information. | |
132 | ||
133 | -0:: | |
134 | Omit diff output for unmerged entries and just show | |
135 | "Unmerged". Can be used only when comparing the working tree | |
136 | with the index. | |
137 | ||
35ef3a4c | 138 | <path>...:: |
f5e6b89b JH |
139 | The <paths> parameters, when given, are used to limit |
140 | the diff to the named paths (you can give directory | |
141 | names and get diff for all files under them). | |
7fc9d69f | 142 | |
f552e51e | 143 | |
9e6c7230 | 144 | include::diff-format.txt[] |
7fc9d69f | 145 | |
803f498c JH |
146 | EXAMPLES |
147 | -------- | |
148 | ||
149 | Various ways to check your working tree:: | |
150 | + | |
151 | ------------ | |
48aeecdc | 152 | $ git diff <1> |
f2dd1c9a | 153 | $ git diff --cached <2> |
48aeecdc SE |
154 | $ git diff HEAD <3> |
155 | ------------ | |
156 | + | |
434e6ef8 SH |
157 | <1> Changes in the working tree not yet staged for the next commit. |
158 | <2> Changes between the index and your last commit; what you | |
a8fa6a08 | 159 | would be committing if you run `git commit` without `-a` option. |
434e6ef8 | 160 | <3> Changes in the working tree since your last commit; what you |
a8fa6a08 | 161 | would be committing if you run `git commit -a` |
803f498c JH |
162 | |
163 | Comparing with arbitrary commits:: | |
164 | + | |
165 | ------------ | |
48aeecdc SE |
166 | $ git diff test <1> |
167 | $ git diff HEAD -- ./test <2> | |
168 | $ git diff HEAD^ HEAD <3> | |
169 | ------------ | |
170 | + | |
434e6ef8 | 171 | <1> Instead of using the tip of the current branch, compare with the |
ba170517 | 172 | tip of "test" branch. |
434e6ef8 | 173 | <2> Instead of comparing with the tip of "test" branch, compare with |
ba170517 JNA |
174 | the tip of the current branch, but limit the comparison to the |
175 | file "test". | |
434e6ef8 | 176 | <3> Compare the version before the last commit and the last commit. |
803f498c | 177 | |
2b9232cc MH |
178 | Comparing branches:: |
179 | + | |
180 | ------------ | |
181 | $ git diff topic master <1> | |
182 | $ git diff topic..master <2> | |
183 | $ git diff topic...master <3> | |
184 | ------------ | |
185 | + | |
186 | <1> Changes between the tips of the topic and the master branches. | |
187 | <2> Same as above. | |
06ada152 | 188 | <3> Changes that occurred on the master branch since when the topic |
ba170517 | 189 | branch was started off it. |
803f498c JH |
190 | |
191 | Limiting the diff output:: | |
192 | + | |
193 | ------------ | |
48aeecdc | 194 | $ git diff --diff-filter=MRC <1> |
90ae710e | 195 | $ git diff --name-status <2> |
48aeecdc SE |
196 | $ git diff arch/i386 include/asm-i386 <3> |
197 | ------------ | |
198 | + | |
a58088ab | 199 | <1> Show only modification, rename, and copy, but not addition |
ba170517 | 200 | or deletion. |
434e6ef8 | 201 | <2> Show only names and the nature of change, but not actual |
ba170517 | 202 | diff output. |
434e6ef8 | 203 | <3> Limit diff output to named subtrees. |
803f498c JH |
204 | |
205 | Munging the diff output:: | |
206 | + | |
207 | ------------ | |
48aeecdc SE |
208 | $ git diff --find-copies-harder -B -C <1> |
209 | $ git diff -R <2> | |
210 | ------------ | |
211 | + | |
434e6ef8 | 212 | <1> Spend extra cycles to find renames, copies and complete |
ba170517 | 213 | rewrites (very expensive). |
434e6ef8 | 214 | <2> Output diff in reverse. |
803f498c | 215 | |
3bdfd443 DA |
216 | SEE ALSO |
217 | -------- | |
b77134b0 JN |
218 | diff(1), |
219 | linkgit:git-difftool[1], | |
220 | linkgit:git-log[1], | |
221 | linkgit:gitdiffcore[7], | |
222 | linkgit:git-format-patch[1], | |
b7e10b2c CT |
223 | linkgit:git-apply[1], |
224 | linkgit:git-show[1] | |
803f498c | 225 | |
7fc9d69f JH |
226 | GIT |
227 | --- | |
9e1f0a85 | 228 | Part of the linkgit:git[1] suite |