]>
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 | -------- | |
b8105375 | 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 | |
f5e6b89b | 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 | |
24 | stage these changes by using gitlink: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 | |
f5e6b89b JH |
30 | 'git-diff' [--options] --cached [<commit>] [--] [<path>...]:: |
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. | |
36 | ||
e697e4cd | 37 | 'git-diff' [--options] <commit> [--] [<path>...]:: |
f5e6b89b JH |
38 | |
39 | This form is to view the changes you have in your | |
40 | working tree relative to the named <commit>. You can | |
41 | use HEAD to compare it with the latest commit, or a | |
42 | branch name to compare with the tip of a different | |
43 | branch. | |
44 | ||
e697e4cd | 45 | 'git-diff' [--options] <commit> <commit> [--] [<path>...]:: |
f5e6b89b | 46 | |
2b9232cc MH |
47 | This is to view the changes between two arbitrary |
48 | <commit>. | |
49 | ||
50 | 'git-diff' [--options] <commit>..<commit> [--] [<path>...]:: | |
51 | ||
52 | This is synonymous to the previous form. If <commit> on | |
53 | one side is omitted, it will have the same effect as | |
54 | using HEAD instead. | |
55 | ||
0c783f66 | 56 | 'git-diff' [--options] <commit>\...<commit> [--] [<path>...]:: |
2b9232cc MH |
57 | |
58 | This form is to view the changes on the branch containing | |
59 | and up to the second <commit>, starting at a common ancestor | |
0c783f66 | 60 | of both <commit>. "git-diff A\...B" is equivalent to |
2b9232cc MH |
61 | "git-diff $(git-merge-base A B) B". You can omit any one |
62 | of <commit>, which has the same effect as using HEAD instead. | |
f5e6b89b JH |
63 | |
64 | Just in case if you are doing something exotic, it should be | |
0c783f66 JH |
65 | noted that all of the <commit> in the above description, except |
66 | for the last two forms that use ".." notations, can be any | |
67 | <tree-ish>. | |
dfa2f22f | 68 | |
41a5564e SP |
69 | For a more complete list of ways to spell <commit>, see |
70 | "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. | |
2b9232cc MH |
71 | However, "diff" is about comparing two _endpoints_, not ranges, |
72 | and the range notations ("<commit>..<commit>" and | |
0c783f66 | 73 | "<commit>\...<commit>") do not mean a range as defined in the |
2b9232cc | 74 | "SPECIFYING RANGES" section in gitlink:git-rev-parse[1]. |
7fc9d69f JH |
75 | |
76 | OPTIONS | |
77 | ------- | |
f5e6b89b | 78 | include::diff-options.txt[] |
35ef3a4c JH |
79 | |
80 | <path>...:: | |
f5e6b89b JH |
81 | The <paths> parameters, when given, are used to limit |
82 | the diff to the named paths (you can give directory | |
83 | names and get diff for all files under them). | |
7fc9d69f JH |
84 | |
85 | ||
803f498c JH |
86 | EXAMPLES |
87 | -------- | |
88 | ||
89 | Various ways to check your working tree:: | |
90 | + | |
91 | ------------ | |
48aeecdc | 92 | $ git diff <1> |
f2dd1c9a | 93 | $ git diff --cached <2> |
48aeecdc SE |
94 | $ git diff HEAD <3> |
95 | ------------ | |
96 | + | |
434e6ef8 SH |
97 | <1> Changes in the working tree not yet staged for the next commit. |
98 | <2> Changes between the index and your last commit; what you | |
803f498c | 99 | would be committing if you run "git commit" without "-a" option. |
434e6ef8 | 100 | <3> Changes in the working tree since your last commit; what you |
803f498c | 101 | would be committing if you run "git commit -a" |
803f498c JH |
102 | |
103 | Comparing with arbitrary commits:: | |
104 | + | |
105 | ------------ | |
48aeecdc SE |
106 | $ git diff test <1> |
107 | $ git diff HEAD -- ./test <2> | |
108 | $ git diff HEAD^ HEAD <3> | |
109 | ------------ | |
110 | + | |
434e6ef8 | 111 | <1> Instead of using the tip of the current branch, compare with the |
803f498c | 112 | tip of "test" branch. |
434e6ef8 | 113 | <2> Instead of comparing with the tip of "test" branch, compare with |
89438677 | 114 | the tip of the current branch, but limit the comparison to the |
803f498c | 115 | file "test". |
434e6ef8 | 116 | <3> Compare the version before the last commit and the last commit. |
803f498c | 117 | |
2b9232cc MH |
118 | Comparing branches:: |
119 | + | |
120 | ------------ | |
121 | $ git diff topic master <1> | |
122 | $ git diff topic..master <2> | |
123 | $ git diff topic...master <3> | |
124 | ------------ | |
125 | + | |
126 | <1> Changes between the tips of the topic and the master branches. | |
127 | <2> Same as above. | |
128 | <3> Changes that occured on the master branch since when the topic | |
129 | branch was started off it. | |
803f498c JH |
130 | |
131 | Limiting the diff output:: | |
132 | + | |
133 | ------------ | |
48aeecdc | 134 | $ git diff --diff-filter=MRC <1> |
90ae710e | 135 | $ git diff --name-status <2> |
48aeecdc SE |
136 | $ git diff arch/i386 include/asm-i386 <3> |
137 | ------------ | |
138 | + | |
434e6ef8 | 139 | <1> Show only modification, rename and copy, but not addition |
803f498c | 140 | nor deletion. |
434e6ef8 | 141 | <2> Show only names and the nature of change, but not actual |
90ae710e | 142 | diff output. |
434e6ef8 | 143 | <3> Limit diff output to named subtrees. |
803f498c JH |
144 | |
145 | Munging the diff output:: | |
146 | + | |
147 | ------------ | |
48aeecdc SE |
148 | $ git diff --find-copies-harder -B -C <1> |
149 | $ git diff -R <2> | |
150 | ------------ | |
151 | + | |
434e6ef8 | 152 | <1> Spend extra cycles to find renames, copies and complete |
803f498c | 153 | rewrites (very expensive). |
434e6ef8 | 154 | <2> Output diff in reverse. |
803f498c JH |
155 | |
156 | ||
7fc9d69f JH |
157 | Author |
158 | ------ | |
159 | Written by Linus Torvalds <torvalds@osdl.org> | |
160 | ||
161 | Documentation | |
162 | -------------- | |
163 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
164 | ||
165 | GIT | |
166 | --- | |
a7154e91 | 167 | Part of the gitlink:git[7] suite |