diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-25 17:34:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 17:34:37 -0800 |
| commit | a372d5bb569776befd395d9c66067ecc09f13b96 (patch) | |
| tree | e9f46a0ff18a8d49520307068a47e8944c44aa3d /git-log.html | |
| parent | a70c988a0584e1197ffd19b26c28e9790da32363 (diff) | |
| download | git-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz | |
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'git-log.html')
| -rw-r--r-- | git-log.html | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/git-log.html b/git-log.html index 10bcde3f4..49e62b278 100644 --- a/git-log.html +++ b/git-log.html @@ -1211,11 +1211,8 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim this option allows you to ignore the individual commits
brought in to your history by such a merge.
</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>This option also changes default diff format for merge commits
-to `first-parent`, see `--diff-merges=first-parent` for details.</code></pre>
-</div></div>
+<div class="paragraph"><p>This option also changes default diff format for merge commits
+to <code>first-parent</code>, see <code>--diff-merges=first-parent</code> for details.</p></div>
</dd>
<dt class="hdlist1">
--not
@@ -4481,6 +4478,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=<file>
+</dt>
+<dt class="hdlist1">
+--rotate-to=<file>
+</dt>
+<dd>
+<p>
+ Discard the files before the named <file> 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>
@@ -5096,7 +5108,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">
|