<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-diff-files</em> [-q] [<common diff options>] [<path>…]</p>\r
+<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</p>\r
</dd>\r
<dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+ Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
+--stat\r
+</dt>\r
+<dd>\r
+<p>\r
+ Generate a diffstat instead of a patch.\r
+</p>\r
+</dd>\r
+<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+ Output a condensed summary of extended header information\r
+ such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
+--patch-with-stat\r
+</dt>\r
+<dd>\r
+<p>\r
+ Generate patch and prepend its diffstat.\r
+</p>\r
+</dd>\r
+<dt>\r
-z\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+--diff-filter=[ACDMRTUXB*]\r
+</dt>\r
+<dd>\r
+<p>\r
+ Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),\r
+ Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their\r
+ type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are\r
+ Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).\r
+ Any combination of the filter characters may be used.\r
+ When <tt>*</tt> (All-or-none) is added to the combination, all\r
+ paths are selected if there is any file that matches\r
+ other criteria in the comparison; if there is no file\r
+ that matches other criteria, nothing is selected.\r
+</p>\r
+</dd>\r
+<dt>\r
--find-copies-harder\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+ Make the <string> not a plain string but an extended POSIX\r
+ regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
-O<orderfile>\r
</dt>\r
<dd>\r
omit diff output for unmerged entries and just show "Unmerged".</p>\r
</dd>\r
<dt>\r
+-c,--cc\r
+</dt>\r
+<dd>\r
+<p>\r
+ This compares stage 2 (our branch), stage 3 (their\r
+ branch) and the working tree file and outputs a combined\r
+ diff, similar to the way <em>diff-tree</em> shows a merge\r
+ commit with these flags.\r
+</p>\r
+</dd>\r
+<dt>\r
-q\r
</dt>\r
<dd>\r
</li>\r
</ol>\r
</div>\r
+<h2>combined diff format</h2>\r
+<div class="sectionbody">\r
+<p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option\r
+to produce <em>combined diff</em>, which looks like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>diff --combined describe.c\r
+@@@ +98,7 @@@\r
+ return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\r
+ }\r
+\r
+- static void describe(char *arg)\r
+ -static void describe(struct commit *cmit, int last_one)\r
+++static void describe(char *arg, int last_one)\r
+ {\r
+ + unsigned char sha1[20];\r
+ + struct commit *cmit;</tt></pre>\r
+</div></div>\r
+<p>Unlike the traditional <em>unified</em> diff format, which shows two\r
+files A and B with a single column that has <tt>-</tt> (minus —\r
+appears in A but removed in B), <tt>+</tt> (plus — missing in A but\r
+added to B), or <tt> </tt> (space — unchanged) prefix, this format\r
+compares two or more files file1, file2,… with one file X, and\r
+shows how X differs from each of fileN. One column for each of\r
+fileN is prepended to the output line to note how X's line is\r
+different from it.</p>\r
+<p>A <tt>-</tt> character in the column N means that the line appears in\r
+fileN but it does not appear in the last file. A <tt>+</tt> character\r
+in the column N means that the line appears in the last file,\r
+and fileN does not have that line.</p>\r
+<p>In the above example output, the function signature was changed\r
+from both files (hence two <tt>-</tt> removals from both file1 and\r
+file2, plus <tt>++</tt> to mean one line that was added does not appear\r
+in either file1 nor file2). Also two other lines are the same\r
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>\r
+<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
+merge commit with the merge result (i.e. file1..fileN are the\r
+parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
+two unresolved merge parents with the working tree file\r
+(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
+"their version").</p>\r
+</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:18 PDT\r
+Last updated 17-May-2006 10:33:59 UTC\r
</div>\r
</div>\r
</body>\r