<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
</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
<p>\r
By default, "git-diff-tree --stdin" does not show\r
differences for merge commits. With this flag, it shows\r
- differences to that commit from all of its parents.\r
+ differences to that commit from all of its parents. See\r
+ also <em>-c</em>.\r
</p>\r
</dd>\r
<dt>\r
</p>\r
</dd>\r
<dt>\r
--c,--cc\r
+-c\r
</dt>\r
<dd>\r
<p>\r
- These flags change the way a merge commit is displayed\r
+ This flag changes the way a merge commit is displayed\r
(which means it is useful only when the command is given\r
one <tree-ish>, or <em>--stdin</em>). It shows the differences\r
- from each of the parents to the merge result\r
- simultaneously, instead of showing pairwise diff between\r
- a parent and the result one at a time, which <em>-m</em> option\r
- output does. <em>--cc</em> further compresses the output by\r
- omiting hunks that show differences from only one\r
+ from each of the parents to the merge result simultaneously\r
+ instead of showing pairwise diff between a parent and the\r
+ result one at a time (which is what the <em>-m</em> option does).\r
+ Furthermore, it lists only files which were modified\r
+ from all parents.\r
+</p>\r
+</dd>\r
+<dt>\r
+-cc\r
+</dt>\r
+<dd>\r
+<p>\r
+ This flag changes the way a merge commit patch is displayed,\r
+ in a similar way to the <em>-c</em> option. It implies the <em>-c</em>\r
+ and <em>-p</em> options and further compresses the patch output\r
+ by omitting hunks that show differences from only one\r
parent, or show the same change from all but one parent\r
for an Octopus merge. When this optimization makes all\r
hunks disappear, the commit itself and the commit log\r
- message is not shown, just like any other "empty diff" cases.\r
+ message is not shown, just like in any other "empty diff" case.\r
+</p>\r
+</dd>\r
+<dt>\r
+--always\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the commit itself and the commit log message even\r
+ if the diff itself is empty.\r
</p>\r
</dd>\r
</dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Feb-2006 15:49:55 PDT\r
+Last updated 10-Apr-2006 23:46:08 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / blobdiff