Autogenerated HTML docs for v1.5.3-rc2-22-g69a9b

diff --git a/config.txt b/config.txt
index d0e9a175f4c967f03462e92a0357165ddfb45473..a850d55bf68d3e64486f38bad1adb3fc1b97a81a 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -281,6 +281,14 @@ core.excludesfile::
        of files which are not meant to be tracked.  See
        gitlink:gitignore[5].
 
+core.editor::
+       Commands such as `commit` and `tag` that lets you edit
+       messages by lauching an editor uses the value of this
+       variable when it is set, and the environment variable
+       `GIT_EDITOR` is not set.  The order of preference is
+       `GIT_EDITOR` environment, `core.editor`, `EDITOR` and
+       `VISUAL` environment variables and then finally `vi`.
+
 core.pager::
        The command that git will use to paginate output.  Can be overridden
        with the `GIT_PAGER` environment variable.

diff --git a/git-commit.html b/git-commit.html
index 0fac2b9c84204615b580c1949750249f0397ac67..f528785bca3b459a7e717e53170fc606f5b51a11 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -657,10 +657,12 @@ message when a commit is made to force UTF-8 at the commit
 object level, because re-coding to UTF-8 is not necessarily a\r
 reversible operation.</p>\r
 </div>\r
-<h2>ENVIRONMENT VARIABLES</h2>\r
+<h2>ENVIRONMENT AND CONFIGURATION VARIABLES</h2>\r
 <div class="sectionbody">\r
-<p>The command specified by either the VISUAL or EDITOR environment\r
-variables is used to edit the commit log message.</p>\r
+<p>The editor used to edit the commit log message will be chosen from the\r
+GIT_EDITOR environment variable, the core.editor configuration variable, the\r
+VISUAL environment variable, or the EDITOR environment variable (in that\r
+order).</p>\r
 </div>\r
 <h2>HOOKS</h2>\r
 <div class="sectionbody">\r
@@ -687,7 +689,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:35 UTC\r
+Last updated 20-Jul-2007 10:27:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index f96142f96a733c9cd71ecffd3325bbb168a8ef38..8e0e7e2d0400b85b05c7e684bc87d9f5f1279e4a 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -244,10 +244,12 @@ on the Subject: line and the rest of the commit in the body.
 
 include::i18n.txt[]
 
-ENVIRONMENT VARIABLES
----------------------
-The command specified by either the VISUAL or EDITOR environment
-variables is used to edit the commit log message.
+ENVIRONMENT AND CONFIGURATION VARIABLES
+---------------------------------------
+The editor used to edit the commit log message will be chosen from the
+GIT_EDITOR environment variable, the core.editor configuration variable, the
+VISUAL environment variable, or the EDITOR environment variable (in that
+order).
 
 HOOKS
 -----

diff --git a/git-config.html b/git-config.html
index d549cbd7f61799b6f5acc839300d822274e6f689..65d4bbd3478dc2d37e8226f6285b0177ef8ecb6b 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1012,6 +1012,19 @@ core.excludesfile
 </p>\r
 </dd>\r
 <dt>\r
+core.editor\r
+</dt>\r
+<dd>\r
+<p>\r
+        Commands such as <tt>commit</tt> and <tt>tag</tt> that lets you edit\r
+        messages by lauching an editor uses the value of this\r
+        variable when it is set, and the environment variable\r
+        <tt>GIT_EDITOR</tt> is not set.  The order of preference is\r
+        <tt>GIT_EDITOR</tt> environment, <tt>core.editor</tt>, <tt>EDITOR</tt> and\r
+        <tt>VISUAL</tt> environment variables and then finally <tt>vi</tt>.\r
+</p>\r
+</dd>\r
+<dt>\r
 core.pager\r
 </dt>\r
 <dd>\r
@@ -1851,7 +1864,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:35 UTC\r
+Last updated 20-Jul-2007 10:27:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.html b/git-send-email.html
index 1b54a8be89370605174de05c6d0f0418426a9e4d..21e221ce02ab00f80da3139511f76f5f22146a65 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -322,8 +322,8 @@ enabled interface to provide the necessary information.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Use $EDITOR to edit an introductory message for the\r
-        patch series.\r
+        Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an\r
+        introductory message for the patch series.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -512,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:53 UTC\r
+Last updated 20-Jul-2007 10:27:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 293686c31f9c80074d7b6d34fa303f56e19d8113..d243ed1e3a3c4f3e94d01b076e7715d37a1cd204 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -44,8 +44,8 @@ The --cc option must be repeated for each user you want on the cc list.
        value; if that is unspecified, default to --chain-reply-to.
 
 --compose::
-       Use $EDITOR to edit an introductory message for the
-       patch series.
+       Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an
+       introductory message for the patch series.
 
 --from::
        Specify the sender of the emails.  This will default to

diff --git a/git.html b/git.html
index fcf654ec1af1b378d398ecf4b17d624ca80aaba9..373c69f9b3eb1388761c495d8c4690cbc2d0dcc6 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1813,7 +1813,9 @@ parameter, &lt;path&gt;.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        This environment variable overrides <tt>$PAGER</tt>.\r
+        This environment variable overrides <tt>$PAGER</tt>. If it is set\r
+        to an empty string or to the value "cat", git will not launch\r
+        a pager.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2408,7 +2410,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:01 UTC\r
+Last updated 20-Jul-2007 10:27:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 3fbfd45ffedfafc7b4de718e9455e7555aabdbb8..4c4d1746e03bdf47959ba58335785974d20efdee 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -417,7 +417,9 @@ other
        See gitlink:git-merge[1]
 
 'GIT_PAGER'::
-       This environment variable overrides `$PAGER`.
+       This environment variable overrides `$PAGER`. If it is set
+       to an empty string or to the value "cat", git will not launch
+       a pager.
 
 'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such