Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef

The documentation erroneously mentions the GIT_NOTES_REWRITE_REF
override in the description of notes.rewrite.<command>.  Move it
under notes.rewriteRef where it belongs.

Signed-off-by: Leif Arne Storset <lstorset@opera.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 92f851e797ca820f6f6126391eafee0d4eec7e26..8f86050b05f5643240cfd760492079dbbcb73c76 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1359,10 +1359,6 @@ notes.rewrite.<command>::
        automatically copies your notes from the original to the
        rewritten commit.  Defaults to `true`, but see
        "notes.rewriteRef" below.
        automatically copies your notes from the original to the
        rewritten commit.  Defaults to `true`, but see
        "notes.rewriteRef" below.

-+
-This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
-environment variable, which must be a colon separated list of refs or
-globs.

 
 notes.rewriteMode::
        When copying notes during a rewrite (see the
 
 notes.rewriteMode::
        When copying notes during a rewrite (see the


@@ -1382,6 +1378,10 @@ notes.rewriteRef::
 +
 Does not have a default value; you must configure this variable to
 enable note rewriting.
 +
 Does not have a default value; you must configure this variable to
 enable note rewriting.

++
+This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
+environment variable, which must be a colon separated list of refs or
+globs.

 
 pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
 
 pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no