]>
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 | -------- | |
b1889c36 | 11 | 'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...] |
7fc9d69f JH |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
cfc01c03 ML |
15 | Show changes between two trees, a tree and the working tree, a |
16 | tree and the index file, or the index file and the working tree. | |
35ef3a4c | 17 | |
b1889c36 | 18 | 'git diff' [--options] [--] [<path>...]:: |
dfa2f22f | 19 | |
f5e6b89b JH |
20 | This form is to view the changes you made relative to |
21 | the index (staging area for the next commit). In other | |
22 | words, the differences are what you _could_ tell git to | |
23 | further add to the index but you still haven't. You can | |
5162e697 | 24 | stage these changes by using linkgit:git-add[1]. |
2b9232cc | 25 | + |
24757702 JN |
26 | If exactly two paths are given and at least one points outside |
27 | the current repository, 'git diff' will compare the two files / | |
28 | directories. This behavior can be forced by --no-index. | |
d516c2d1 | 29 | |
b1889c36 | 30 | 'git diff' [--options] --cached [<commit>] [--] [<path>...]:: |
f5e6b89b JH |
31 | |
32 | This form is to view the changes you staged for the next | |
ce054545 | 33 | commit relative to the named <commit>. Typically you |
f5e6b89b JH |
34 | would want comparison with the latest commit, so if you |
35 | do not give <commit>, it defaults to HEAD. | |
2baf1850 | 36 | --staged is a synonym of --cached. |
f5e6b89b | 37 | |
b1889c36 | 38 | 'git diff' [--options] <commit> [--] [<path>...]:: |
f5e6b89b JH |
39 | |
40 | This form is to view the changes you have in your | |
41 | working tree relative to the named <commit>. You can | |
42 | use HEAD to compare it with the latest commit, or a | |
43 | branch name to compare with the tip of a different | |
44 | branch. | |
45 | ||
b1889c36 | 46 | 'git diff' [--options] <commit> <commit> [--] [<path>...]:: |
f5e6b89b | 47 | |
2b9232cc MH |
48 | This is to view the changes between two arbitrary |
49 | <commit>. | |
50 | ||
b1889c36 | 51 | 'git diff' [--options] <commit>..<commit> [--] [<path>...]:: |
2b9232cc MH |
52 | |
53 | This is synonymous to the previous form. If <commit> on | |
54 | one side is omitted, it will have the same effect as | |
55 | using HEAD instead. | |
56 | ||
b1889c36 | 57 | 'git diff' [--options] <commit>\...<commit> [--] [<path>...]:: |
2b9232cc MH |
58 | |
59 | This form is to view the changes on the branch containing | |
60 | and up to the second <commit>, starting at a common ancestor | |
b1889c36 JN |
61 | of both <commit>. "git diff A\...B" is equivalent to |
62 | "git diff $(git-merge-base A B) B". You can omit any one | |
2b9232cc | 63 | of <commit>, which has the same effect as using HEAD instead. |
f5e6b89b JH |
64 | |
65 | Just in case if you are doing something exotic, it should be | |
0c783f66 | 66 | noted that all of the <commit> in the above description, except |
ed84e6d5 JN |
67 | in the last two forms that use ".." notations, can be any |
68 | <tree>. The third form ('git diff <commit> <commit>') can also | |
69 | be used to compare two <blob> objects. | |
dfa2f22f | 70 | |
41a5564e | 71 | For a more complete list of ways to spell <commit>, see |
9d83e382 | 72 | "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. |
2b9232cc MH |
73 | However, "diff" is about comparing two _endpoints_, not ranges, |
74 | and the range notations ("<commit>..<commit>" and | |
0c783f66 | 75 | "<commit>\...<commit>") do not mean a range as defined in the |
9d83e382 | 76 | "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. |
7fc9d69f JH |
77 | |
78 | OPTIONS | |
79 | ------- | |
c1a95fa6 | 80 | :git-diff: 1 |
f5e6b89b | 81 | include::diff-options.txt[] |
35ef3a4c JH |
82 | |
83 | <path>...:: | |
f5e6b89b JH |
84 | The <paths> parameters, when given, are used to limit |
85 | the diff to the named paths (you can give directory | |
86 | names and get diff for all files under them). | |
7fc9d69f | 87 | |
f552e51e | 88 | |
9e6c7230 | 89 | include::diff-format.txt[] |
7fc9d69f | 90 | |
803f498c JH |
91 | EXAMPLES |
92 | -------- | |
93 | ||
94 | Various ways to check your working tree:: | |
95 | + | |
96 | ------------ | |
48aeecdc | 97 | $ git diff <1> |
f2dd1c9a | 98 | $ git diff --cached <2> |
48aeecdc SE |
99 | $ git diff HEAD <3> |
100 | ------------ | |
101 | + | |
434e6ef8 SH |
102 | <1> Changes in the working tree not yet staged for the next commit. |
103 | <2> Changes between the index and your last commit; what you | |
803f498c | 104 | would be committing if you run "git commit" without "-a" option. |
434e6ef8 | 105 | <3> Changes in the working tree since your last commit; what you |
803f498c | 106 | would be committing if you run "git commit -a" |
803f498c JH |
107 | |
108 | Comparing with arbitrary commits:: | |
109 | + | |
110 | ------------ | |
48aeecdc SE |
111 | $ git diff test <1> |
112 | $ git diff HEAD -- ./test <2> | |
113 | $ git diff HEAD^ HEAD <3> | |
114 | ------------ | |
115 | + | |
434e6ef8 | 116 | <1> Instead of using the tip of the current branch, compare with the |
803f498c | 117 | tip of "test" branch. |
434e6ef8 | 118 | <2> Instead of comparing with the tip of "test" branch, compare with |
89438677 | 119 | the tip of the current branch, but limit the comparison to the |
803f498c | 120 | file "test". |
434e6ef8 | 121 | <3> Compare the version before the last commit and the last commit. |
803f498c | 122 | |
2b9232cc MH |
123 | Comparing branches:: |
124 | + | |
125 | ------------ | |
126 | $ git diff topic master <1> | |
127 | $ git diff topic..master <2> | |
128 | $ git diff topic...master <3> | |
129 | ------------ | |
130 | + | |
131 | <1> Changes between the tips of the topic and the master branches. | |
132 | <2> Same as above. | |
06ada152 | 133 | <3> Changes that occurred on the master branch since when the topic |
2b9232cc | 134 | branch was started off it. |
803f498c JH |
135 | |
136 | Limiting the diff output:: | |
137 | + | |
138 | ------------ | |
48aeecdc | 139 | $ git diff --diff-filter=MRC <1> |
90ae710e | 140 | $ git diff --name-status <2> |
48aeecdc SE |
141 | $ git diff arch/i386 include/asm-i386 <3> |
142 | ------------ | |
143 | + | |
434e6ef8 | 144 | <1> Show only modification, rename and copy, but not addition |
803f498c | 145 | nor deletion. |
434e6ef8 | 146 | <2> Show only names and the nature of change, but not actual |
90ae710e | 147 | diff output. |
434e6ef8 | 148 | <3> Limit diff output to named subtrees. |
803f498c JH |
149 | |
150 | Munging the diff output:: | |
151 | + | |
152 | ------------ | |
48aeecdc SE |
153 | $ git diff --find-copies-harder -B -C <1> |
154 | $ git diff -R <2> | |
155 | ------------ | |
156 | + | |
434e6ef8 | 157 | <1> Spend extra cycles to find renames, copies and complete |
803f498c | 158 | rewrites (very expensive). |
434e6ef8 | 159 | <2> Output diff in reverse. |
803f498c | 160 | |
3bdfd443 DA |
161 | SEE ALSO |
162 | -------- | |
b77134b0 JN |
163 | diff(1), |
164 | linkgit:git-difftool[1], | |
165 | linkgit:git-log[1], | |
166 | linkgit:gitdiffcore[7], | |
167 | linkgit:git-format-patch[1], | |
168 | linkgit:git-apply[1] | |
803f498c | 169 | |
7fc9d69f JH |
170 | Author |
171 | ------ | |
172 | Written by Linus Torvalds <torvalds@osdl.org> | |
173 | ||
174 | Documentation | |
175 | -------------- | |
176 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
177 | ||
178 | GIT | |
179 | --- | |
9e1f0a85 | 180 | Part of the linkgit:git[1] suite |