diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:52 -0800 |
| commit | 376f39fbea0dfb31402abda878a7b0018f6a6161 (patch) | |
| tree | d97dd8a947407fc4c36a97ad7b8b37e6b8142e9e /Documentation/config.txt | |
| parent | Merge branch 'rj/cygwin-msvc' (diff) | |
| parent | Provide a build time default-pager setting (diff) | |
| download | tgif-376f39fbea0dfb31402abda878a7b0018f6a6161.tar.xz | |
Merge branch 'jn/editor-pager'
* jn/editor-pager:
Provide a build time default-pager setting
Provide a build time default-editor setting
am -i, git-svn: use "git var GIT_PAGER"
add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
Teach git var about GIT_PAGER
Teach git var about GIT_EDITOR
Suppress warnings from "git var -l"
Do not use VISUAL editor on dumb terminals
Handle more shell metacharacters in editor names
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index cb73d7571f..c9b8db5cf7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -387,9 +387,7 @@ core.editor:: Commands such as `commit` and `tag` that lets you edit messages by launching 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`, `VISUAL` and - `EDITOR` environment variables and then finally `vi`. + `GIT_EDITOR` is not set. See linkgit:git-var[1]. core.pager:: The command that git will use to paginate output. Can |