diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
commit | a90214fb857c988a9e8dff46626dc715918a9330 (patch) | |
tree | 756c139e2481e113fa188ed55f6b2c46c153a7a3 /git-log.html | |
parent | ace33e4fa1aa5ba14bafe92218bf07dea068791f (diff) | |
download | git-htmldocs-a90214fb857c988a9e8dff46626dc715918a9330.tar.gz |
Autogenerated HTML docs for v2.20.1-421-g9403f
Diffstat (limited to 'git-log.html')
-rw-r--r-- | git-log.html | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/git-log.html b/git-log.html index 6bd050001..115f9da23 100644 --- a/git-log.html +++ b/git-log.html @@ -2553,6 +2553,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
+<em>%S</em>: ref name given on the command line by which the commit was reached
+ (like <code>git log --source</code>), only works with <code>git log</code>
+</p>
+</li>
+<li>
+<p>
<em>%e</em>: encoding
</p>
</li>
@@ -3298,11 +3304,20 @@ dimmed-zebra </div></div>
</dd>
<dt class="hdlist1">
+--no-color-moved
+</dt>
+<dd>
+<p>
+ Turn off move detection. This can be used to override configuration
+ settings. It is the same as <code>--color-moved=no</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--color-moved-ws=<modes>
</dt>
<dd>
<p>
- This configures how white spaces are ignored when performing the
+ This configures how whitespace is ignored when performing the
move detection for <code>--color-moved</code>.
These modes can be given as a comma separated list:
</p>
@@ -3310,6 +3325,14 @@ dimmed-zebra <div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
+no
+</dt>
+<dd>
+<p>
+ Do not ignore whitespace when performing move detection.
+</p>
+</dd>
+<dt class="hdlist1">
ignore-space-at-eol
</dt>
<dd>
@@ -3341,7 +3364,7 @@ allow-indentation-change </dt>
<dd>
<p>
- Initially ignore any white spaces in the move detection, then
+ Initially ignore any whitespace in the move detection, then
group the moved code blocks only into a block if the change in
whitespace is the same per line. This is incompatible with the
other modes.
@@ -3351,6 +3374,16 @@ allow-indentation-change </div></div>
</dd>
<dt class="hdlist1">
+--no-color-moved-ws
+</dt>
+<dd>
+<p>
+ Do not ignore whitespace when performing move detection. This can be
+ used to override configuration settings. It is the same as
+ <code>--color-moved-ws=no</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--word-diff[=<mode>]
</dt>
<dd>
|