summaryrefslogtreecommitdiffstats
path: root/git-show.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
commita372d5bb569776befd395d9c66067ecc09f13b96 (patch)
treee9f46a0ff18a8d49520307068a47e8944c44aa3d /git-show.html
parenta70c988a0584e1197ffd19b26c28e9790da32363 (diff)
downloadgit-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'git-show.html')
-rw-r--r--git-show.html17
1 files changed, 16 insertions, 1 deletions
diff --git a/git-show.html b/git-show.html
index f693150b1..7b0b821e7 100644
--- a/git-show.html
+++ b/git-show.html
@@ -3004,6 +3004,21 @@ components matches the pattern. For example, the pattern "<code>foo*bar</code>"
matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
</dd>
<dt class="hdlist1">
+--skip-to=&lt;file&gt;
+</dt>
+<dt class="hdlist1">
+--rotate-to=&lt;file&gt;
+</dt>
+<dd>
+<p>
+ Discard the files before the named &lt;file&gt; from the output
+ (i.e. <em>skip to</em>), or move them to the end of the output
+ (i.e. <em>rotate to</em>). These were invented primarily for use
+ of the <code>git difftool</code> command, and may not be very useful
+ otherwise.
+</p>
+</dd>
+<dt class="hdlist1">
-R
</dt>
<dd>
@@ -3569,7 +3584,7 @@ mind.</p></div>
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
- have i18n.commitencoding in <code>.git/config</code> file, like this:
+ have <code>i18n.commitEncoding</code> in <code>.git/config</code> file, like this:
</p>
<div class="listingblock">
<div class="content">