]>
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]. | |
25 | ||
d516c2d1 JS |
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. | |
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 JH |
46 | |
47 | This form is to view the changes between two <commit>, | |
48 | for example, tips of two branches. | |
49 | ||
50 | Just in case if you are doing something exotic, it should be | |
51 | noted that all of the <commit> in the above description can be | |
52 | any <tree-ish>. | |
dfa2f22f | 53 | |
41a5564e SP |
54 | For a more complete list of ways to spell <commit>, see |
55 | "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. | |
56 | ||
7fc9d69f JH |
57 | |
58 | OPTIONS | |
59 | ------- | |
f5e6b89b | 60 | include::diff-options.txt[] |
35ef3a4c JH |
61 | |
62 | <path>...:: | |
f5e6b89b JH |
63 | The <paths> parameters, when given, are used to limit |
64 | the diff to the named paths (you can give directory | |
65 | names and get diff for all files under them). | |
7fc9d69f JH |
66 | |
67 | ||
803f498c JH |
68 | EXAMPLES |
69 | -------- | |
70 | ||
71 | Various ways to check your working tree:: | |
72 | + | |
73 | ------------ | |
48aeecdc | 74 | $ git diff <1> |
f2dd1c9a | 75 | $ git diff --cached <2> |
48aeecdc SE |
76 | $ git diff HEAD <3> |
77 | ------------ | |
78 | + | |
f5e6b89b | 79 | <1> changes in the working tree not yet staged for the next commit. |
803f498c JH |
80 | <2> changes between the index and your last commit; what you |
81 | would be committing if you run "git commit" without "-a" option. | |
82 | <3> changes in the working tree since your last commit; what you | |
83 | would be committing if you run "git commit -a" | |
803f498c JH |
84 | |
85 | Comparing with arbitrary commits:: | |
86 | + | |
87 | ------------ | |
48aeecdc SE |
88 | $ git diff test <1> |
89 | $ git diff HEAD -- ./test <2> | |
90 | $ git diff HEAD^ HEAD <3> | |
91 | ------------ | |
92 | + | |
803f498c JH |
93 | <1> instead of using the tip of the current branch, compare with the |
94 | tip of "test" branch. | |
95 | <2> instead of comparing with the tip of "test" branch, compare with | |
89438677 | 96 | the tip of the current branch, but limit the comparison to the |
803f498c JH |
97 | file "test". |
98 | <3> compare the version before the last commit and the last commit. | |
803f498c JH |
99 | |
100 | ||
101 | Limiting the diff output:: | |
102 | + | |
103 | ------------ | |
48aeecdc SE |
104 | $ git diff --diff-filter=MRC <1> |
105 | $ git diff --name-status -r <2> | |
106 | $ git diff arch/i386 include/asm-i386 <3> | |
107 | ------------ | |
108 | + | |
803f498c JH |
109 | <1> show only modification, rename and copy, but not addition |
110 | nor deletion. | |
111 | <2> show only names and the nature of change, but not actual | |
112 | diff output. --name-status disables usual patch generation | |
abda1ef5 | 113 | which in turn also disables recursive behavior, so without -r |
803f498c JH |
114 | you would only see the directory name if there is a change in a |
115 | file in a subdirectory. | |
116 | <3> limit diff output to named subtrees. | |
803f498c JH |
117 | |
118 | Munging the diff output:: | |
119 | + | |
120 | ------------ | |
48aeecdc SE |
121 | $ git diff --find-copies-harder -B -C <1> |
122 | $ git diff -R <2> | |
123 | ------------ | |
124 | + | |
803f498c JH |
125 | <1> spend extra cycles to find renames, copies and complete |
126 | rewrites (very expensive). | |
127 | <2> output diff in reverse. | |
803f498c JH |
128 | |
129 | ||
7fc9d69f JH |
130 | Author |
131 | ------ | |
132 | Written by Linus Torvalds <torvalds@osdl.org> | |
133 | ||
134 | Documentation | |
135 | -------------- | |
136 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
137 | ||
138 | GIT | |
139 | --- | |
a7154e91 | 140 | Part of the gitlink:git[7] suite |
7fc9d69f | 141 |