diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
commit | df3d3cddff51ef14a454394a9977e899f72b8244 (patch) | |
tree | b6f9a3c1f550494dd1bb439f3b1cb05067ce621a /git-diff-tree.html | |
parent | b8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff) | |
download | git-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.html | 26 |
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]
[<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</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<regex>
+</dt>
+<dt class="hdlist1">
+--ignore-matching-lines=<regex>
+</dt>
+<dd>
+<p>
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</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 <tree-ish>s directly, use the merge
+ base between the two <tree-ish>s as the "before" side. There
+ must be two <tree-ish>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>
|