Autogenerated HTML docs for v1.6.3.1-54-g99dd

Junio C Hamano · Junio C Hamano · commit 52ba29509db8 · 2009-05-18T17:43:02.000Z
diff --git a/config.txt b/config.txt
@@ -604,6 +604,12 @@ color.pager::
 	A boolean to enable/disable colored output when the pager is in
 	use (default is true).
 
+color.showbranch::
+	A boolean to enable/disable color in the output of
+	linkgit:git-show-branch[1]. May be set to `always`,
+	`false` (or `never`) or `auto` (or `true`), in which case colors are used
+	only when the output is to a terminal. Defaults to false.
+
 color.status::
 	A boolean to enable/disable color in the output of
 	linkgit:git-status[1]. May be set to `always`,
diff --git a/git-add.html b/git-add.html
@@ -322,7 +322,7 @@ <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
-          [--all | [--update | -u]] [--intent-to-add | -N]
+          [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
           [--refresh] [--ignore-errors] [--] &lt;filepattern&gt;&#8230;</div></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
@@ -425,6 +425,19 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt>
+-e, --edit
+</dt>
+<dd>
+<p>
+        Open the diff vs. the index in an editor and let the user
+        edit it.  After the editor was closed, adjust the hunk headers
+        and apply the patch to the index.
+</p>
+<div class="para"><p><strong>NOTE</strong>: Obviously, if you change anything else than the first character
+on lines beginning with a space or a minus, the patch will no longer
+apply.</p></div>
+</dd>
+<dt>
 -u
 </dt>
 <dt>
@@ -697,7 +710,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-18 06:17:30 UTC
+Last updated 2009-05-18 17:42:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.txt b/git-add.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
-	  [--all | [--update | -u]] [--intent-to-add | -N]
+	  [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
 	  [--refresh] [--ignore-errors] [--] <filepattern>...
 
 DESCRIPTION
@@ -76,6 +76,15 @@ OPTIONS
 	bypassed and the 'patch' subcommand is invoked using each of
 	the specified filepatterns before exiting.
 
+-e, \--edit::
+	Open the diff vs. the index in an editor and let the user
+	edit it.  After the editor was closed, adjust the hunk headers
+	and apply the patch to the index.
++
+*NOTE*: Obviously, if you change anything else than the first character
+on lines beginning with a space or a minus, the patch will no longer
+apply.
+
 -u::
 --update::
 	Update only files that git already knows about, staging modified
diff --git a/git-config.html b/git-config.html
@@ -1610,6 +1610,17 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt>
+color.showbranch
+</dt>
+<dd>
+<p>
+        A boolean to enable/disable color in the output of
+        <a href="git-show-branch.html">git-show-branch(1)</a>. May be set to <tt>always</tt>,
+        <tt>false</tt> (or <tt>never</tt>) or <tt>auto</tt> (or <tt>true</tt>), in which case colors are used
+        only when the output is to a terminal. Defaults to false.
+</p>
+</dd>
+<dt>
 color.status
 </dt>
 <dd>
@@ -3307,7 +3318,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-05-10 06:47:57 UTC
+Last updated 2009-05-18 17:42:45 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.html b/git-show-branch.html
@@ -323,6 +323,7 @@ <h2>SYNOPSIS</h2>
 <div class="verseblock">
 <div class="content"><em>git show-branch</em> [--all] [--remotes] [--topo-order] [--current]
                 [--more=&lt;n&gt; | --list | --independent | --merge-base]
+                [--color | --no-color]
                 [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;
 <em>git show-branch</em> (-g|--reflog)[=&lt;n&gt;[,&lt;base&gt;]] [--list] [&lt;ref&gt;]</div></div>
 </div>
@@ -498,6 +499,24 @@ <h2 id="_options">OPTIONS</h2>
         current branch (or <tt>HEAD</tt> if it is detached).
 </p>
 </dd>
+<dt>
+--color
+</dt>
+<dd>
+<p>
+        Color the status sign (one of these: <tt>*</tt> <tt>!</tt> <tt>+</tt> <tt>-</tt>) of each commit
+        corresponding to the branch it's in.
+</p>
+</dd>
+<dt>
+--no-color
+</dt>
+<dd>
+<p>
+        Turn off colored output, even when the configuration file gives the
+        default to color output.
+</p>
+</dd>
 </dl></div>
 <div class="para"><p>Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.</p></div>
@@ -578,7 +597,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-25 08:29:43 UTC
+Last updated 2009-05-18 17:42:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 [verse]
 'git show-branch' [--all] [--remotes] [--topo-order] [--current]
 		[--more=<n> | --list | --independent | --merge-base]
+		[--color | --no-color]
 		[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
 'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
 
@@ -107,6 +108,14 @@ OPTIONS
 	When no explicit <ref> parameter is given, it defaults to the
 	current branch (or `HEAD` if it is detached).
 
+--color::
+	Color the status sign (one of these: `*` `!` `+` `-`) of each commit
+	corresponding to the branch it's in.
+
+--no-color::
+	Turn off colored output, even when the configuration file gives the
+	default to color output.
+
 Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.
 
