From: Leif Arne Storset <lstorset@opera.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Leif Arne Storset <lstorset@opera.com>
Subject: [PATCH] Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef
Date: Wed, 5 May 2010 16:16:25 +0200 [thread overview]
Message-ID: <1273068985-25380-1-git-send-email-lstorset@opera.com> (raw)
In-Reply-To: <201005051600.03446.trast@student.ethz.ch>
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>
---
Documentation/config.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 92f851e..8f86050 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
--
1.7.1
prev parent reply other threads:[~2010-05-05 14:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-05 13:35 [PATCH] Documentation/config.txt: Move GIT_NOTES_REWRITE_REF to notes.rewriteRef Leif Arne Storset
2010-05-05 14:00 ` Thomas Rast
2010-05-05 14:15 ` Leif Arne Storset
2010-05-05 14:16 ` Leif Arne Storset [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1273068985-25380-1-git-send-email-lstorset@opera.com \
--to=lstorset@opera.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).