aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLeif Arne Storset <lstorset@opera.com>2010-05-05 16:16:25 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-07 21:38:50 -0700
commitcfb88e9a8d4926b0011ae2dd67e1f57a98f4b768 (patch)
treeb5208d8d4fc02055cc034143284727c65af17ad6 /Documentation
parentb6b0afdc30e066788592ca07c9a6c6936c68cc11 (diff)
downloadgit-cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768.tar.gz
git-cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 92f851e79..8f86050b0 100644
--- 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.
-+
-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
@@ -1382,6 +1378,10 @@ notes.rewriteRef::
+
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