Autogenerated HTML docs for v2.25.1-377-g2d211

1 files changed, 11 insertions, 7 deletions

diff --git a/git-config.html b/git-config.html
index e42880571..38f30c4a1 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1749,7 +1749,9 @@ color
 </p>

 <div class="paragraph"><p>The basic colors accepted are <code>normal</code>, <code>black</code>, <code>red</code>, <code>green</code>, <code>yellow</code>,

 <code>blue</code>, <code>magenta</code>, <code>cyan</code> and <code>white</code>.  The first color given is the

-foreground; the second is the background.</p></div>

+foreground; the second is the background.  All the basic colors except

+<code>normal</code> have a bright variant that can be speficied by prefixing the

+color with <code>bright</code>, like <code>brightred</code>.</p></div>

 <div class="paragraph"><p>Colors may also be given as numbers between 0 and 255; these use ANSI

 256-color mode (but note that not all terminals may support this).  If

 your terminal supports it, you may also specify 24-bit RGB values as

@@ -3301,13 +3303,14 @@ branch.&lt;name&gt;.rebase
         "git pull" is run. See "pull.rebase" for doing this in a non

         branch-specific manner.

 </p>

-<div class="paragraph"><p>When <code>merges</code>, pass the <code>--rebase-merges</code> option to <em>git rebase</em>

+<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> (deprecated in favor of <code>merges</code>), also pass

+<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>, the rebase is run in interactive mode.</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

 it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>

 for details).</p></div>

@@ -7731,13 +7734,14 @@ pull.rebase
         pull" is run. See "branch.&lt;name&gt;.rebase" for setting this on a

         per-branch basis.

 </p>

-<div class="paragraph"><p>When <code>merges</code>, pass the <code>--rebase-merges</code> option to <em>git rebase</em>

+<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> (deprecated in favor of <code>merges</code>), also pass

+<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>, the rebase is run in interactive mode.</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

 it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>

 for details).</p></div>