summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
commitdf3d3cddff51ef14a454394a9977e899f72b8244 (patch)
treeb6f9a3c1f550494dd1bb439f3b1cb05067ce621a /git-diff-tree.html
parentb8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff)
downloadgit-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz
Autogenerated HTML docs for v2.29.2-154-g7f7eb
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html26
1 files changed, 24 insertions, 2 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 8d7f6b89b..e9dabadc5 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -750,7 +750,7 @@ git-diff-tree(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
- [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+ [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
[&lt;common diff options&gt;] &lt;tree-ish&gt; [&lt;tree-ish&gt;] [&lt;path&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
@@ -1862,6 +1862,18 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
</p>
</dd>
<dt class="hdlist1">
+-I&lt;regex&gt;
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=&lt;regex&gt;
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match &lt;regex&gt;. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
@@ -2047,6 +2059,16 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
</p>
</dd>
<dt class="hdlist1">
+--merge-base
+</dt>
+<dd>
+<p>
+ Instead of comparing the &lt;tree-ish&gt;s directly, use the merge
+ base between the two &lt;tree-ish&gt;s as the "before" side. There
+ must be two &lt;tree-ish&gt;s given and they must both be commits.
+</p>
+</dd>
+<dt class="hdlist1">
--stdin
</dt>
<dd>
@@ -3844,7 +3866,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-11-02 14:02:22 PST
</div>
</div>
</body>