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-index.html | |
parent | b8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff) | |
download | git-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz |
Autogenerated HTML docs for v2.29.2-154-g7f7eb
Diffstat (limited to 'git-diff-index.html')
-rw-r--r-- | git-diff-index.html | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index 9f8d854fa..fa2765926 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -749,7 +749,7 @@ git-diff-index(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</pre>
+<pre class="content"><em>git diff-index</em> [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>…]</pre>
<div class="attribution">
</div></div>
</div>
@@ -1861,6 +1861,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>
@@ -2016,7 +2028,17 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- do not consider the on-disk file at all
+ Do not consider the on-disk file at all.
+</p>
+</dd>
+<dt class="hdlist1">
+--merge-base
+</dt>
+<dd>
+<p>
+ Instead of comparing <tree-ish> directly, use the merge base
+ between <tree-ish> and HEAD instead. <tree-ish> must be a
+ commit.
</p>
</dd>
<dt class="hdlist1">
@@ -2741,7 +2763,7 @@ always have the special all-zero sha1.</td> <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>
|