Merge branch 'jn/editor-pager'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index cb73d7571f25deffb061441577ce1ae531fdf5d9..c9b8db5cf701fa39fc518dd196c4acfb57cac0c4 100644 (file)
--- 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