Autogenerated HTML docs for v2.33.1-711-g9d530

1 files changed, 20 insertions, 21 deletions

diff --git a/git-config.html b/git-config.html
index ea8507689..a9bb6b2b3 100644
--- a/git-config.html
+++ b/git-config.html
@@ -3401,9 +3401,6 @@ branch.<name>.rebase
 <div class="paragraph"><p>When <code>merges</code> (or just <em>m</em>), pass the <code>--rebase-merges</code> option to <em>git rebase</em>

 so that the local merge commits are included in the rebase (see

 <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>

-<div class="paragraph"><p>When <code>preserve</code> (or just <em>p</em>, deprecated in favor of <code>merges</code>), also pass

-<code>--preserve-merges</code> along to <em>git rebase</em> so that locally committed merge

-commits will not be flattened by running <em>git pull</em>.</p></div>

 <div class="paragraph"><p>When the value is <code>interactive</code> (or just <em>i</em>), the rebase is run in interactive

 mode.</p></div>

 <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use

@@ -3557,28 +3554,33 @@ color.blame.highlightRecent
 </dt>

 <dd>

 <p>

-        This can be used to color the metadata of a blame line depending

-        on age of the line.

+        Specify the line annotation color for <code>git blame --color-by-age</code>

+        depending upon the age of the line.

 </p>

-<div class="paragraph"><p>This setting should be set to a comma-separated list of color and date settings,

-starting and ending with a color, the dates should be set from oldest to newest.

-The metadata will be colored given the colors if the line was introduced

-before the given timestamp, overwriting older timestamped colors.</p></div>

-<div class="paragraph"><p>Instead of an absolute timestamp relative timestamps work as well, e.g.

-2.weeks.ago is valid to address anything older than 2 weeks.</p></div>

-<div class="paragraph"><p>It defaults to <em>blue,12 month ago,white,1 month ago,red</em>, which colors

-everything older than one year blue, recent changes between one month and

-one year old are kept white, and lines introduced within the last month are

-colored red.</p></div>

+<div class="paragraph"><p>This setting should be set to a comma-separated list of color and

+date settings, starting and ending with a color, the dates should be

+set from oldest to newest. The metadata will be colored with the

+specified colors if the line was introduced before the given

+timestamp, overwriting older timestamped colors.</p></div>

 </dd>

+</dl></div>

+<div class="paragraph"><p>+

+Instead of an absolute timestamp relative timestamps work as well,

+e.g. <code>2.weeks.ago</code> is valid to address anything older than 2 weeks.</p></div>

+<div class="paragraph"><p>+

+It defaults to <code>blue,12 month ago,white,1 month ago,red</code>, which

+colors everything older than one year blue, recent changes between

+one month and one year old are kept white, and lines introduced

+within the last month are colored red.</p></div>

+<div class="dlist"><dl>

 <dt class="hdlist1">

 color.blame.repeatedLines

 </dt>

 <dd>

 <p>

-        Use the customized color for the part of git-blame output that

-        is repeated meta information per line (such as commit id,

-        author name, date and timezone). Defaults to cyan.

+        Use the specified color to colorize line annotations for

+        <code>git blame --color-lines</code>, if they come from the same commit as the

+        preceding line. Defaults to cyan.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -8382,9 +8384,6 @@ pull.rebase
 <div class="paragraph"><p>When <code>merges</code> (or just <em>m</em>), pass the <code>--rebase-merges</code> option to <em>git rebase</em>

 so that the local merge commits are included in the rebase (see

 <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>

-<div class="paragraph"><p>When <code>preserve</code> (or just <em>p</em>, deprecated in favor of <code>merges</code>), also pass

-<code>--preserve-merges</code> along to <em>git rebase</em> so that locally committed merge

-commits will not be flattened by running <em>git pull</em>.</p></div>

 <div class="paragraph"><p>When the value is <code>interactive</code> (or just <em>i</em>), the rebase is run in interactive

 mode.</p></div>

 <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use