]>
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 MH |
25 | + |
26 | If exactly two paths are given, and at least one is untracked, | |
27 | compare the two files / directories. This behavior can be | |
28 | 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 JH |
66 | noted that all of the <commit> in the above description, except |
67 | for the last two forms that use ".." notations, can be any | |
68 | <tree-ish>. | |
dfa2f22f | 69 | |
41a5564e | 70 | For a more complete list of ways to spell <commit>, see |
5162e697 | 71 | "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. |
2b9232cc MH |
72 | However, "diff" is about comparing two _endpoints_, not ranges, |
73 | and the range notations ("<commit>..<commit>" and | |
0c783f66 | 74 | "<commit>\...<commit>") do not mean a range as defined in the |
5162e697 | 75 | "SPECIFYING RANGES" section in linkgit:git-rev-parse[1]. |
7fc9d69f JH |
76 | |
77 | OPTIONS | |
78 | ------- | |
c1a95fa6 | 79 | :git-diff: 1 |
f5e6b89b | 80 | include::diff-options.txt[] |
35ef3a4c JH |
81 | |
82 | <path>...:: | |
f5e6b89b JH |
83 | The <paths> parameters, when given, are used to limit |
84 | the diff to the named paths (you can give directory | |
85 | names and get diff for all files under them). | |
7fc9d69f | 86 | |
f552e51e | 87 | |
9e6c7230 | 88 | include::diff-format.txt[] |
7fc9d69f | 89 | |
803f498c JH |
90 | EXAMPLES |
91 | -------- | |
92 | ||
93 | Various ways to check your working tree:: | |
94 | + | |
95 | ------------ | |
48aeecdc | 96 | $ git diff <1> |
f2dd1c9a | 97 | $ git diff --cached <2> |
48aeecdc SE |
98 | $ git diff HEAD <3> |
99 | ------------ | |
100 | + | |
434e6ef8 SH |
101 | <1> Changes in the working tree not yet staged for the next commit. |
102 | <2> Changes between the index and your last commit; what you | |
803f498c | 103 | would be committing if you run "git commit" without "-a" option. |
434e6ef8 | 104 | <3> Changes in the working tree since your last commit; what you |
803f498c | 105 | would be committing if you run "git commit -a" |
803f498c JH |
106 | |
107 | Comparing with arbitrary commits:: | |
108 | + | |
109 | ------------ | |
48aeecdc SE |
110 | $ git diff test <1> |
111 | $ git diff HEAD -- ./test <2> | |
112 | $ git diff HEAD^ HEAD <3> | |
113 | ------------ | |
114 | + | |
434e6ef8 | 115 | <1> Instead of using the tip of the current branch, compare with the |
803f498c | 116 | tip of "test" branch. |
434e6ef8 | 117 | <2> Instead of comparing with the tip of "test" branch, compare with |
89438677 | 118 | the tip of the current branch, but limit the comparison to the |
803f498c | 119 | file "test". |
434e6ef8 | 120 | <3> Compare the version before the last commit and the last commit. |
803f498c | 121 | |
2b9232cc MH |
122 | Comparing branches:: |
123 | + | |
124 | ------------ | |
125 | $ git diff topic master <1> | |
126 | $ git diff topic..master <2> | |
127 | $ git diff topic...master <3> | |
128 | ------------ | |
129 | + | |
130 | <1> Changes between the tips of the topic and the master branches. | |
131 | <2> Same as above. | |
06ada152 | 132 | <3> Changes that occurred on the master branch since when the topic |
2b9232cc | 133 | branch was started off it. |
803f498c JH |
134 | |
135 | Limiting the diff output:: | |
136 | + | |
137 | ------------ | |
48aeecdc | 138 | $ git diff --diff-filter=MRC <1> |
90ae710e | 139 | $ git diff --name-status <2> |
48aeecdc SE |
140 | $ git diff arch/i386 include/asm-i386 <3> |
141 | ------------ | |
142 | + | |
434e6ef8 | 143 | <1> Show only modification, rename and copy, but not addition |
803f498c | 144 | nor deletion. |
434e6ef8 | 145 | <2> Show only names and the nature of change, but not actual |
90ae710e | 146 | diff output. |
434e6ef8 | 147 | <3> Limit diff output to named subtrees. |
803f498c JH |
148 | |
149 | Munging the diff output:: | |
150 | + | |
151 | ------------ | |
48aeecdc SE |
152 | $ git diff --find-copies-harder -B -C <1> |
153 | $ git diff -R <2> | |
154 | ------------ | |
155 | + | |
434e6ef8 | 156 | <1> Spend extra cycles to find renames, copies and complete |
803f498c | 157 | rewrites (very expensive). |
434e6ef8 | 158 | <2> Output diff in reverse. |
803f498c | 159 | |
3bdfd443 DA |
160 | SEE ALSO |
161 | -------- | |
162 | linkgit:git-difftool[1]:: | |
163 | Show changes using common diff tools | |
803f498c | 164 | |
7fc9d69f JH |
165 | Author |
166 | ------ | |
167 | Written by Linus Torvalds <torvalds@osdl.org> | |
168 | ||
169 | Documentation | |
170 | -------------- | |
171 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
172 | ||
173 | GIT | |
174 | --- | |
9e1f0a85 | 175 | Part of the linkgit:git[1] suite |