From f6002a9d88be66b5d7ac79bf312feb0b622791ca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 20 Jul 2007 10:28:22 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc2-22-g69a9b --- config.txt | 8 ++++++++ git-commit.html | 10 ++++++---- git-commit.txt | 10 ++++++---- git-config.html | 15 ++++++++++++++- git-send-email.html | 6 +++--- git-send-email.txt | 4 ++-- git.html | 6 ++++-- git.txt | 4 +++- 8 files changed, 46 insertions(+), 17 deletions(-) diff --git a/config.txt b/config.txt index d0e9a175f..a850d55bf 100644 --- 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 0fac2b9c8..f528785bc 100644 --- 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 reversible operation.

-

ENVIRONMENT VARIABLES

+

ENVIRONMENT AND CONFIGURATION VARIABLES

-

The command specified by either the VISUAL or EDITOR environment -variables is used to edit the commit log message.

+

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

@@ -687,7 +689,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index f96142f96..8e0e7e2d0 100644 --- 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 d549cbd7f..65d4bbd34 100644 --- a/git-config.html +++ b/git-config.html @@ -1012,6 +1012,19 @@ core.excludesfile

+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
@@ -1851,7 +1864,7 @@ transfer.unpackLimit diff --git a/git-send-email.html b/git-send-email.html index 1b54a8be8..21e221ce0 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -322,8 +322,8 @@ enabled interface to provide the necessary information.

- 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.

@@ -512,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 293686c31..d243ed1e3 100644 --- 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 fcf654ec1..373c69f9b 100644 --- a/git.html +++ b/git.html @@ -1813,7 +1813,9 @@ parameter, <path>.

- 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.

@@ -2408,7 +2410,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 3fbfd45ff..4c4d1746e 100644 --- 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 -- 2.26.2