1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.2" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-diff(1)</title>
\r
264 git-diff(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Show changes between commits, commit and working tree, etc
\r
274 <div class="sectionbody">
\r
275 <p><em>git-diff</em> [ --diff-options ] <ent>{0,2} [<path>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Show changes between two ents, an ent and the working tree, an
\r
280 ent and the index file, or the index file and the working tree.
\r
281 The combination of what is compared with what is determined by
\r
282 the number of ents given to the command.</p>
\r
286 When no <ent> is given, the working tree and the index
\r
287 file is compared, using <tt>git-diff-files</tt>.
\r
292 When one <ent> is given, the working tree and the named
\r
293 tree is compared, using <tt>git-diff-index</tt>. The option
\r
294 <tt>--cached</tt> can be given to compare the index file and
\r
300 When two <ent>s are given, these two trees are compared
\r
301 using <tt>git-diff-tree</tt>.
\r
307 <div class="sectionbody">
\r
314 <em>--diff-options</em> are passed to the <tt>git-diff-files</tt>,
\r
315 <tt>git-diff-index</tt>, and <tt>git-diff-tree</tt> commands. See the
\r
316 documentation for these commands for description.
\r
320 <path>…
\r
324 The <path> arguments are also passed to <tt>git-diff-*</tt>
\r
331 <div class="sectionbody">
\r
334 Various ways to check your working tree
\r
337 <div class="listingblock">
\r
338 <div class="content">
\r
339 <pre><tt>$ git diff <b>(1)</b>
\r
340 $ git diff --cached <b>(2)</b>
\r
341 $ git diff HEAD <b>(3)</b>
\r
343 <b>(1)</b> changes in the working tree since your last git-update-index.
\r
344 <b>(2)</b> changes between the index and your last commit; what you
\r
345 would be committing if you run "git commit" without "-a" option.
\r
346 <b>(3)</b> changes in the working tree since your last commit; what you
\r
347 would be committing if you run "git commit -a"</tt></pre>
\r
351 Comparing with arbitrary commits
\r
354 <div class="listingblock">
\r
355 <div class="content">
\r
356 <pre><tt>$ git diff test <b>(1)</b>
\r
357 $ git diff HEAD -- ./test <b>(2)</b>
\r
358 $ git diff HEAD^ HEAD <b>(3)</b>
\r
360 <b>(1)</b> instead of using the tip of the current branch, compare with the
\r
361 tip of "test" branch.
\r
362 <b>(2)</b> instead of comparing with the tip of "test" branch, compare with
\r
363 the tip of the current branch, but limit the comparison to the
\r
365 <b>(3)</b> compare the version before the last commit and the last commit.</tt></pre>
\r
369 Limiting the diff output
\r
372 <div class="listingblock">
\r
373 <div class="content">
\r
374 <pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>
\r
375 $ git diff --name-status -r <b>(2)</b>
\r
376 $ git diff arch/i386 include/asm-i386 <b>(3)</b>
\r
378 <b>(1)</b> show only modification, rename and copy, but not addition
\r
380 <b>(2)</b> show only names and the nature of change, but not actual
\r
381 diff output. --name-status disables usual patch generation
\r
382 which in turn also disables recursive behaviour, so without -r
\r
383 you would only see the directory name if there is a change in a
\r
384 file in a subdirectory.
\r
385 <b>(3)</b> limit diff output to named subtrees.</tt></pre>
\r
389 Munging the diff output
\r
392 <div class="listingblock">
\r
393 <div class="content">
\r
394 <pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>
\r
395 $ git diff -R <b>(2)</b>
\r
397 <b>(1)</b> spend extra cycles to find renames, copies and complete
\r
398 rewrites (very expensive).
\r
399 <b>(2)</b> output diff in reverse.</tt></pre>
\r
405 <div class="sectionbody">
\r
406 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
408 <h2>Documentation</h2>
\r
409 <div class="sectionbody">
\r
410 <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
413 <div class="sectionbody">
\r
414 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
417 <div id="footer-text">
\r
418 Last updated 10-Mar-2006 00:31:25 UTC
\r