Google Git
Sign in
chromium / external / gitster / git-htmldocs / 8638c92248aa3a950fe0a206e702f5c35d69fa35 / . / git-diff.html
blob: ffdb4bb15c731991c13c3bfd5946fd49827606e4 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano01078922006-03-10 00:31:47[diff] [blame]6<meta name="generator" content="AsciiDoc 7.0.2" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
19a { color: blue; }
20a:visited { color: fuchsia; }
21
22em {
23 font-style: italic;
24}
25
26strong {
27 font-weight: bold;
28}
29
30tt {
31 color: navy;
32}
33
34h1, h2, h3, h4, h5, h6 {
35 color: #527bbd;
36 font-family: sans-serif;
37 margin-top: 1.2em;
38 margin-bottom: 0.5em;
39 line-height: 1.3;
40}
41
42h1 {
43 border-bottom: 2px solid silver;
44}
45h2 {
46 border-bottom: 2px solid silver;
47 padding-top: 0.5em;
48}
49
50div.sectionbody {
51 font-family: serif;
52 margin-left: 0;
53}
54
55hr {
56 border: 1px solid silver;
57}
58
59p {
60 margin-top: 0.5em;
61 margin-bottom: 0.5em;
62}
63
64pre {
65 padding: 0;
66 margin: 0;
67}
68
69span#author {
70 color: #527bbd;
71 font-family: sans-serif;
72 font-weight: bold;
73 font-size: 1.2em;
74}
75span#email {
76}
77span#revision {
78 font-family: sans-serif;
79}
80
81div#footer {
82 font-family: sans-serif;
83 font-size: small;
84 border-top: 2px solid silver;
85 padding-top: 0.5em;
86 margin-top: 4.0em;
87}
88div#footer-text {
89 float: left;
90 padding-bottom: 0.5em;
91}
92div#footer-badges {
93 float: right;
94 padding-bottom: 0.5em;
95}
96
97div#preamble,
98div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
99div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
100div.admonitionblock {
101 margin-right: 10%;
102 margin-top: 1.5em;
103 margin-bottom: 1.5em;
104}
105div.admonitionblock {
106 margin-top: 2.5em;
107 margin-bottom: 2.5em;
108}
109
110div.content { /* Block element content. */
111 padding: 0;
112}
113
114/* Block element titles. */
115div.title, caption.title {
116 font-family: sans-serif;
117 font-weight: bold;
118 text-align: left;
119 margin-top: 1.0em;
120 margin-bottom: 0.5em;
121}
122div.title + * {
123 margin-top: 0;
124}
125
126td div.title:first-child {
127 margin-top: 0.0em;
128}
129div.content div.title:first-child {
130 margin-top: 0.0em;
131}
132div.content + div.title {
133 margin-top: 0.0em;
134}
135
136div.sidebarblock > div.content {
137 background: #ffffee;
138 border: 1px solid silver;
139 padding: 0.5em;
140}
141
142div.listingblock > div.content {
143 border: 1px solid silver;
144 background: #f4f4f4;
145 padding: 0.5em;
146}
147
148div.quoteblock > div.content {
149 padding-left: 2.0em;
150}
151div.quoteblock .attribution {
152 text-align: right;
153}
154
155div.admonitionblock .icon {
156 vertical-align: top;
157 font-size: 1.1em;
158 font-weight: bold;
159 text-decoration: underline;
160 color: #527bbd;
161 padding-right: 0.5em;
162}
163div.admonitionblock td.content {
164 padding-left: 0.5em;
165 border-left: 2px solid silver;
166}
167
168div.exampleblock > div.content {
169 border-left: 2px solid silver;
170 padding: 0.5em;
171}
172
173div.verseblock div.content {
174 white-space: pre;
175}
176
177div.imageblock div.content { padding-left: 0; }
178div.imageblock img { border: 1px solid silver; }
179span.image img { border-style: none; }
180
181dl {
182 margin-top: 0.8em;
183 margin-bottom: 0.8em;
184}
185dt {
186 margin-top: 0.5em;
187 margin-bottom: 0;
188 font-style: italic;
189}
190dd > *:first-child {
191 margin-top: 0;
192}
193
194ul, ol {
195 list-style-position: outside;
196}
197ol.olist2 {
198 list-style-type: lower-alpha;
199}
200
201div.tableblock > table {
202 border-color: #527bbd;
203 border-width: 3px;
204}
205thead {
206 font-family: sans-serif;
207 font-weight: bold;
208}
209tfoot {
210 font-weight: bold;
211}
212
213div.hlist {
214 margin-top: 0.8em;
215 margin-bottom: 0.8em;
216}
217td.hlist1 {
218 vertical-align: top;
219 font-style: italic;
220 padding-right: 0.8em;
221}
222td.hlist2 {
223 vertical-align: top;
224}
225
226@media print {
227 div#footer-badges { display: none; }
228}
229include::./stylesheets/xhtml11-manpage.css[]
230/* Workarounds for IE6's broken and incomplete CSS2. */
231
232div.sidebar-content {
233 background: #ffffee;
234 border: 1px solid silver;
235 padding: 0.5em;
236}
237div.sidebar-title, div.image-title {
238 font-family: sans-serif;
239 font-weight: bold;
240 margin-top: 0.0em;
241 margin-bottom: 0.5em;
242}
243
244div.listingblock div.content {
245 border: 1px solid silver;
246 background: #f4f4f4;
247 padding: 0.5em;
248}
249
250div.quoteblock-content {
251 padding-left: 2.0em;
252}
253
254div.exampleblock-content {
255 border-left: 2px solid silver;
256 padding-left: 0.5em;
257}
258</style>
259<title>git-diff(1)</title>
260</head>
261<body>
262<div id="header">
263<h1>
264git-diff(1) Manual Page
265</h1>
266<h2>NAME</h2>
267<div class="sectionbody">
268<p>git-diff -
Junio C Hamano01078922006-03-10 00:31:47[diff] [blame]269 Show changes between commits, commit and working tree, etc
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]270</p>
271</div>
272</div>
273<h2>SYNOPSIS</h2>
274<div class="sectionbody">
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]275<p><em>git-diff</em> [&lt;common diff options&gt;] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]276</div>
277<h2>DESCRIPTION</h2>
278<div class="sectionbody">
Junio C Hamano51c2ab02006-07-09 20:38:54[diff] [blame]279<p>Show changes between two trees, a tree and the working tree, a
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]280tree and the index file, or the index file and the working tree.</p>
281<dl>
282<dt>
283<em>git-diff</em> [--options] [--] [&lt;path&gt;&#8230;]
284</dt>
285<dd>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]286<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]287 This form is to view the changes you made relative to
288 the index (staging area for the next commit). In other
289 words, the differences are what you _could_ tell git to
290 further add to the index but you still haven't. You can
291 stage these changes by using <a href="git-add.html">git-add(1)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]292</p>
Junio C Hamanodb911ee2007-02-28 08:13:52[diff] [blame]293<div class="literalblock">
294<div class="content">
295<pre><tt>If exactly two paths are given, and at least one is untracked,
296compare the two files / directories. This behavior can be
297forced by --no-index.</tt></pre>
298</div></div>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]299</dd>
300<dt>
301<em>git-diff</em> [--options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
302</dt>
303<dd>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]305 This form is to view the changes you staged for the next
Junio C Hamano4bf6dca2006-12-21 02:25:57[diff] [blame]306 commit relative to the named &lt;commit&gt;. Typically you
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]307 would want comparison with the latest commit, so if you
308 do not give &lt;commit&gt;, it defaults to HEAD.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]309</p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]310</dd>
311<dt>
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]312<em>git-diff</em> [--options] &lt;commit&gt; [--] [&lt;path&gt;&#8230;]
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]313</dt>
314<dd>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]315<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]316 This form is to view the changes you have in your
317 working tree relative to the named &lt;commit&gt;. You can
318 use HEAD to compare it with the latest commit, or a
319 branch name to compare with the tip of a different
320 branch.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]321</p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]322</dd>
323<dt>
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]324<em>git-diff</em> [--options] &lt;commit&gt; &lt;commit&gt; [--] [&lt;path&gt;&#8230;]
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]325</dt>
326<dd>
327<p>
328 This form is to view the changes between two &lt;commit&gt;,
329 for example, tips of two branches.
330</p>
331</dd>
332</dl>
333<p>Just in case if you are doing something exotic, it should be
334noted that all of the &lt;commit&gt; in the above description can be
335any &lt;tree-ish&gt;.</p>
Junio C Hamano2d47c622007-01-18 06:24:10[diff] [blame]336<p>For a more complete list of ways to spell &lt;commit&gt;, see
337"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]338</div>
339<h2>OPTIONS</h2>
340<div class="sectionbody">
341<dl>
342<dt>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]343-p
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]344</dt>
345<dd>
346<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]347 Generate patch (see section on generating patches)
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]348</p>
349</dd>
350<dt>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]351-u
352</dt>
353<dd>
354<p>
355 Synonym for "-p".
356</p>
357</dd>
358<dt>
359--raw
360</dt>
361<dd>
362<p>
363 Generate the raw format.
364</p>
365</dd>
366<dt>
367--patch-with-raw
368</dt>
369<dd>
370<p>
371 Synonym for "-p --raw".
372</p>
373</dd>
374<dt>
375--stat[=width[,name-width]]
376</dt>
377<dd>
378<p>
379 Generate a diffstat. You can override the default
380 output width for 80-column terminal by "--stat=width".
381 The width of the filename part can be controlled by
382 giving another width to it separated by a comma.
383</p>
384</dd>
385<dt>
386--numstat
387</dt>
388<dd>
389<p>
390 Similar to --stat, but shows number of added and
391 deleted lines in decimal notation and pathname without
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]392 abbreviation, to make it more machine friendly. For
393 binary files, outputs two <tt>-</tt> instead of saying
394 <tt>0 0</tt>.
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]395</p>
396</dd>
397<dt>
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]398--shortstat
399</dt>
400<dd>
401<p>
402 Output only the last line of the --stat format containing total
403 number of modified files, as well as number of added and deleted
404 lines.
405</p>
406</dd>
407<dt>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]408--summary
409</dt>
410<dd>
411<p>
412 Output a condensed summary of extended header information
413 such as creations, renames and mode changes.
414</p>
415</dd>
416<dt>
417--patch-with-stat
418</dt>
419<dd>
420<p>
421 Synonym for "-p --stat".
422</p>
423</dd>
424<dt>
425-z
426</dt>
427<dd>
428<p>
429 \0 line termination on output
430</p>
431</dd>
432<dt>
433--name-only
434</dt>
435<dd>
436<p>
437 Show only names of changed files.
438</p>
439</dd>
440<dt>
441--name-status
442</dt>
443<dd>
444<p>
445 Show only names and status of changed files.
446</p>
447</dd>
448<dt>
449--color
450</dt>
451<dd>
452<p>
453 Show colored diff.
454</p>
455</dd>
456<dt>
457--no-color
458</dt>
459<dd>
460<p>
461 Turn off colored diff, even when the configuration file
462 gives the default to color output.
463</p>
464</dd>
465<dt>
466--color-words
467</dt>
468<dd>
469<p>
470 Show colored word diff, i.e. color words which have changed.
471</p>
472</dd>
473<dt>
474--no-renames
475</dt>
476<dd>
477<p>
478 Turn off rename detection, even when the configuration
479 file gives the default to do so.
480</p>
481</dd>
482<dt>
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]483--check
484</dt>
485<dd>
486<p>
487 Warn if changes introduce trailing whitespace
488 or an indent that uses a space before a tab.
489</p>
490</dd>
491<dt>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]492--full-index
493</dt>
494<dd>
495<p>
496 Instead of the first handful characters, show full
497 object name of pre- and post-image blob on the "index"
498 line when generating a patch format output.
499</p>
500</dd>
501<dt>
502--binary
503</dt>
504<dd>
505<p>
506 In addition to --full-index, output "binary diff" that
507 can be applied with "git apply".
508</p>
509</dd>
510<dt>
511--abbrev[=&lt;n&gt;]
512</dt>
513<dd>
514<p>
515 Instead of showing the full 40-byte hexadecimal object
516 name in diff-raw format output and diff-tree header
517 lines, show only handful hexdigits prefix. This is
518 independent of --full-index option above, which controls
519 the diff-patch output format. Non default number of
520 digits can be specified with --abbrev=&lt;n&gt;.
521</p>
522</dd>
523<dt>
524-B
525</dt>
526<dd>
527<p>
528 Break complete rewrite changes into pairs of delete and create.
529</p>
530</dd>
531<dt>
532-M
533</dt>
534<dd>
535<p>
536 Detect renames.
537</p>
538</dd>
539<dt>
540-C
541</dt>
542<dd>
543<p>
544 Detect copies as well as renames.
545</p>
546</dd>
547<dt>
548--diff-filter=[ACDMRTUXB*]
549</dt>
550<dd>
551<p>
552 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
553 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
554 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
555 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
556 Any combination of the filter characters may be used.
557 When <tt>*</tt> (All-or-none) is added to the combination, all
558 paths are selected if there is any file that matches
559 other criteria in the comparison; if there is no file
560 that matches other criteria, nothing is selected.
561</p>
562</dd>
563<dt>
564--find-copies-harder
565</dt>
566<dd>
567<p>
568 For performance reasons, by default, -C option finds copies only
569 if the original file of the copy was modified in the same
570 changeset. This flag makes the command
571 inspect unmodified files as candidates for the source of
572 copy. This is a very expensive operation for large
573 projects, so use it with caution.
574</p>
575</dd>
576<dt>
577-l&lt;num&gt;
578</dt>
579<dd>
580<p>
581 -M and -C options require O(n^2) processing time where n
582 is the number of potential rename/copy targets. This
583 option prevents rename/copy detection from running if
584 the number of rename/copy targets exceeds the specified
585 number.
586</p>
587</dd>
588<dt>
589-S&lt;string&gt;
590</dt>
591<dd>
592<p>
593 Look for differences that contain the change in &lt;string&gt;.
594</p>
595</dd>
596<dt>
597--pickaxe-all
598</dt>
599<dd>
600<p>
601 When -S finds a change, show all the changes in that
602 changeset, not just the files that contain the change
603 in &lt;string&gt;.
604</p>
605</dd>
606<dt>
607--pickaxe-regex
608</dt>
609<dd>
610<p>
611 Make the &lt;string&gt; not a plain string but an extended POSIX
612 regex to match.
613</p>
614</dd>
615<dt>
616-O&lt;orderfile&gt;
617</dt>
618<dd>
619<p>
620 Output the patch in the order specified in the
621 &lt;orderfile&gt;, which has one shell glob pattern per line.
622</p>
623</dd>
624<dt>
625-R
626</dt>
627<dd>
628<p>
629 Swap two inputs; that is, show differences from index or
630 on-disk file to tree contents.
631</p>
632</dd>
633<dt>
634--text
635</dt>
636<dd>
637<p>
638 Treat all files as text.
639</p>
640</dd>
641<dt>
642-a
643</dt>
644<dd>
645<p>
646 Shorthand for "--text".
647</p>
648</dd>
649<dt>
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]650--ignore-space-at-eol
651</dt>
652<dd>
653<p>
654 Ignore changes in white spaces at EOL.
655</p>
656</dd>
657<dt>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]658--ignore-space-change
659</dt>
660<dd>
661<p>
662 Ignore changes in amount of white space. This ignores white
663 space at line end, and consider all other sequences of one or
664 more white space characters to be equivalent.
665</p>
666</dd>
667<dt>
668-b
669</dt>
670<dd>
671<p>
672 Shorthand for "--ignore-space-change".
673</p>
674</dd>
675<dt>
676--ignore-all-space
677</dt>
678<dd>
679<p>
680 Ignore white space when comparing lines. This ignores
681 difference even if one line has white space where the other
682 line has none.
683</p>
684</dd>
685<dt>
686-w
687</dt>
688<dd>
689<p>
690 Shorthand for "--ignore-all-space".
691</p>
692</dd>
Junio C Hamano48fd2f62007-03-19 02:02:30[diff] [blame]693<dt>
694--exit-code
695</dt>
696<dd>
697<p>
698 Make the program exit with codes similar to diff(1).
699 That is, it exits with 1 if there were differences and
700 0 means no differences.
701</p>
702</dd>
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]703<dt>
704--quiet
705</dt>
706<dd>
707<p>
708 Disable all output of the program. Implies --exit-code.
709</p>
710</dd>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]711</dl>
712<p>For more detailed explanation on these common options, see also
713<a href="diffcore.html">diffcore documentation</a>.</p>
714<dl>
715<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]716&lt;path&gt;&#8230;
717</dt>
718<dd>
719<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]720 The &lt;paths&gt; parameters, when given, are used to limit
721 the diff to the named paths (you can give directory
722 names and get diff for all files under them).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]723</p>
724</dd>
725</dl>
726</div>
727<h2>EXAMPLES</h2>
728<div class="sectionbody">
729<dl>
730<dt>
731Various ways to check your working tree
732</dt>
733<dd>
734<div class="listingblock">
735<div class="content">
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]736<pre><tt>$ git diff <b>(1)</b>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]737$ git diff --cached <b>(2)</b>
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]738$ git diff HEAD <b>(3)</b></tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]739</div></div>
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]740<ol>
741<li>
742<p>
Junio C Hamano47848ae2006-12-14 11:20:06[diff] [blame]743changes in the working tree not yet staged for the next commit.
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]744</p>
745</li>
746<li>
747<p>
748changes between the index and your last commit; what you
749would be committing if you run "git commit" without "-a" option.
750</p>
751</li>
752<li>
753<p>
754changes in the working tree since your last commit; what you
755would be committing if you run "git commit -a"
756</p>
757</li>
758</ol>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]759</dd>
760<dt>
761Comparing with arbitrary commits
762</dt>
763<dd>
764<div class="listingblock">
765<div class="content">
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]766<pre><tt>$ git diff test <b>(1)</b>
767$ git diff HEAD -- ./test <b>(2)</b>
768$ git diff HEAD^ HEAD <b>(3)</b></tt></pre>
769</div></div>
770<ol>
771<li>
772<p>
773instead of using the tip of the current branch, compare with the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]774tip of "test" branch.
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]775</p>
776</li>
777<li>
778<p>
779instead of comparing with the tip of "test" branch, compare with
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]780the tip of the current branch, but limit the comparison to the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]781file "test".
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]782</p>
783</li>
784<li>
785<p>
786compare the version before the last commit and the last commit.
787</p>
788</li>
789</ol>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]790</dd>
791<dt>
792Limiting the diff output
793</dt>
794<dd>
795<div class="listingblock">
796<div class="content">
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]797<pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>
798$ git diff --name-status -r <b>(2)</b>
799$ git diff arch/i386 include/asm-i386 <b>(3)</b></tt></pre>
800</div></div>
801<ol>
802<li>
803<p>
804show only modification, rename and copy, but not addition
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]805nor deletion.
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]806</p>
807</li>
808<li>
809<p>
810show only names and the nature of change, but not actual
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]811diff output. --name-status disables usual patch generation
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]812which in turn also disables recursive behavior, so without -r
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]813you would only see the directory name if there is a change in a
814file in a subdirectory.
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]815</p>
816</li>
817<li>
818<p>
819limit diff output to named subtrees.
820</p>
821</li>
822</ol>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]823</dd>
824<dt>
825Munging the diff output
826</dt>
827<dd>
828<div class="listingblock">
829<div class="content">
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]830<pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>
831$ git diff -R <b>(2)</b></tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]832</div></div>
Junio C Hamanoc8d88c22006-04-29 07:02:01[diff] [blame]833<ol>
834<li>
835<p>
836spend extra cycles to find renames, copies and complete
837rewrites (very expensive).
838</p>
839</li>
840<li>
841<p>
842output diff in reverse.
843</p>
844</li>
845</ol>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]846</dd>
847</dl>
848</div>
849<h2>Author</h2>
850<div class="sectionbody">
851<p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
852</div>
853<h2>Documentation</h2>
854<div class="sectionbody">
855<p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
856</div>
857<h2>GIT</h2>
858<div class="sectionbody">
859<p>Part of the <a href="git.html">git(7)</a> suite</p>
860</div>
861<div id="footer">
862<div id="footer-text">
Junio C Hamano20f64da2007-04-04 18:38:30[diff] [blame]863Last updated 04-Apr-2007 18:33:40 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]864</div>
865</div>
866</body>
867</html>