| blob | f317ae4e9b0f466dcad663c7e1e60be47bbe7a05 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 gitdiffcore(7) Manual Page
574 </h1>
577 <p>gitdiffcore -
578 Tweaking diff output
579 </p>
580 </div>
581 </div>
588 </div></div>
589 </div>
592 <div class="paragraph"><p>The diff commands <em>git diff-index</em>, <em>git diff-files</em>, and <em>git diff-tree</em>
593 can be told to manipulate differences they find in
595 is collectively called "diffcore transformation". This short note
597 that is easier to understand than the conventional kind.</p></div>
598 </div>
601 <div class="paragraph"><p>The <em>git diff-*</em> family works by first comparing two sets of
602 files:</p></div>
604 <li>
605 <p>
609 used);
610 </p>
611 </li>
612 <li>
613 <p>
615 working directory;
616 </p>
617 </li>
618 <li>
619 <p>
621 </p>
622 </li>
623 </ul></div>
625 the two sets of files by any pathspecs given on their command-lines,
626 and compare corresponding paths in the two resulting sets of files.</p></div>
627 <div class="paragraph"><p>The pathspecs are used to limit the world diff operates in. They remove
628 the filepairs outside the specified sets of pathnames. E.g. If the
629 input set of filepairs included:</p></div>
633 </div></div>
634 <div class="paragraph"><p>but the command invocation was <tt>git diff-files myfile</tt>, then the
635 junkfile entry would be removed from the list because only "myfile"
636 is under consideration.</p></div>
638 internally called "diffcore", in a format similar to what is output
639 when the -p option is not used. E.g.</p></div>
646 </div></div>
648 (each of which is called "filepair", although at this point each
649 of them talks about a single file), and transforms such a list
652 <li>
653 <p>
654 diffcore-break
655 </p>
656 </li>
657 <li>
658 <p>
659 diffcore-rename
660 </p>
661 </li>
662 <li>
663 <p>
664 diffcore-merge-broken
665 </p>
666 </li>
667 <li>
668 <p>
669 diffcore-pickaxe
670 </p>
671 </li>
672 <li>
673 <p>
674 diffcore-order
675 </p>
676 </li>
677 </ul></div>
678 <div class="paragraph"><p>These are applied in sequence. The set of filepairs <em>git diff-*</em>
679 commands find are used as the input to diffcore-break, and
680 the output from diffcore-break is used as the input to the
681 next transformation. The final result is then passed to the
682 output routine and generates either diff-raw format (see Output
684 diff-patch format.</p></div>
685 </div>
686 <h2 id="_diffcore_break_for_splitting_up_complete_rewrites">diffcore-break: For Splitting Up "Complete Rewrites"</h2>
690 used to detect a filepair that represents "complete rewrite" and
691 break such filepair into two filepairs that represent delete and
692 create. E.g. If the input contained this filepair:</p></div>
696 </div></div>
698 it changes it to:</p></div>
703 </div></div>
705 the extent of changes between the contents of the files before
706 and after modification (i.e. the contents that have "bcd1234…"
707 and "0123456…" as their SHA1 content ID, in the above
708 example). The amount of deletion of original contents and
709 insertion of new material are added together, and if it exceeds
710 the "break score", the filepair is broken into two. The break
711 score defaults to 50% of the size of the smaller of the original
712 and the result (i.e. if the edit shrinks the file, the size of
713 the result is used; if the edit lengthens the file, the size of
714 the original is used), and can be customized by giving a number
716 </div>
717 <h2 id="_diffcore_rename_for_detection_renames_and_copies">diffcore-rename: For Detection Renames and Copies</h2>
720 controlled by the -M option (to detect renames) and the -C option
722 input contained these filepairs:</p></div>
727 </div></div>
729 the contents of the created file file0, then rename detection
730 merges these filepairs and creates:</p></div>
734 </div></div>
735 <div class="paragraph"><p>When the "-C" option is used, the original contents of modified files,
736 and deleted files (and also unmodified files, if the
737 "--find-copies-harder" option is used) are considered as candidates
738 of the source files in rename/copy operation. If the input were like
739 these filepairs, that talk about a modified file fileY and a newly
740 created file file0:</p></div>
745 </div></div>
747 file0 are compared, and if they are similar enough, they are
748 changed to:</p></div>
753 </div></div>
755 algorithm used in diffcore-break is used to determine if two
756 files are "similar enough", and can be customized to use
757 a similarity score different from the default of 50% by giving a
762 diffcore mechanism as well as modified ones. This lets the copy
763 detector consider unmodified files as copy source candidates at
766 copied happened to have been modified in the same changeset.</p></div>
767 </div>
768 <h2 id="_diffcore_merge_broken_for_putting_complete_rewrites_back_together">diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2>
771 diffcore-break, and not transformed into rename/copy by
772 diffcore-rename, back into a single modification. This always
773 runs when diffcore-break is used.</p></div>
775 different "extent of changes" computation from the ones used by
776 diffcore-break and diffcore-rename. It counts only the deletion
777 from the original, and does not count insertion. If you removed
779 new lines to make a new 1000-line document, you did not do a
780 complete rewrite. diffcore-break breaks such a case in order to
781 help diffcore-rename to consider such filepairs as candidate of
782 rename/copy detection, but if filepairs broken that way were not
783 matched with other filepairs to create rename/copy, then this
784 transformation merges them back into the original
788 material is deleted, the broken pairs are merged back into a
789 single modification) by giving a second number to -B option,
790 like these:</p></div>
792 <li>
793 <p>
795 for diffcore-merge-broken).
796 </p>
797 </li>
798 <li>
799 <p>
801 </p>
802 </li>
803 </ul></div>
805 creation and deletion patches. This was an unnecessary hack and
806 the latest implementation always merges all the broken pairs
807 back into modifications, but the resulting patch output is
808 formatted differently for easier review in case of such
809 a complete rewrite by showing the entire contents of old version
812 </div>
813 <h2 id="_diffcore_pickaxe_for_detecting_addition_deletion_of_specified_string">diffcore-pickaxe: For Detecting Addition/Deletion of Specified String</h2>
816 changes that touch a specified string, and is controlled by the
818 commands.</p></div>
821 different number of specified string. Such a filepair represents
822 "the string appeared in this changeset". It also checks for the
823 opposite case that loses the specified string.</p></div>
825 only such filepairs that touch the specified string in its
827 filepairs intact if there is such a filepair, or makes the
828 output empty otherwise. The latter behaviour is designed to
829 make reviewing of the changes in the context of the whole
830 changeset easier.</p></div>
831 </div>
832 <h2 id="_diffcore_order_for_sorting_the_output_based_on_filenames">diffcore-order: For Sorting the Output Based on Filenames</h2>
835 (or project’s) taste, and is controlled by the -O option to the
838 pattern. Filepairs that match a glob pattern on an earlier line
839 in the file are output before ones that match a later line, and
840 filepairs that do not match any glob pattern are output last.</p></div>
842 would look like this:</p></div>
845 <pre><tt>README
846 Makefile
847 Documentation
848 *.h
849 *.c
850 t</tt></pre>
851 </div></div>
852 </div>
863 </div>
867 </div>
868 </div>
873 </div>
874 </div>
875 </body>
876 </html>