[PATCH] Documentation/config.txt: Move GIT_NOTES_REWRITE_REF to notes.rewriteRef

[PATCH] Documentation/config.txt: Move GIT_NOTES_REWRITE_REF to notes.rewriteRef

[Leif Arne Storset]

Was notes.rewrite. The environment variable refers to globs and refs, which are only mentioned by notes.rewriteRef; notes.rewrite is boolean.

Signed-off-by: Leif Arne Storset <lstorset@opera.com>
---
This should be a trivial fix.

 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

Re: [PATCH] Documentation/config.txt: Move GIT_NOTES_REWRITE_REF to notes.rewriteRef

[Thomas Rast]

Leif Arne Storset wrote:
> Was notes.rewrite. The environment variable refers to globs and refs, which are only mentioned by notes.rewriteRef; notes.rewrite is boolean.
> 
> Signed-off-by: Leif Arne Storset <lstorset@opera.com>
> ---
> This should be a trivial fix.

ACK and thanks for spotting this.  Putting it in the wrong place was
my fault.

I found the commit message confusing, though (my first thought was "we
have a notes.rewrite configuration variable?"), and you also have a
way too long line there.  How about

  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.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: [PATCH] Documentation/config.txt: Move GIT_NOTES_REWRITE_REF to notes.rewriteRef

[Leif Arne Storset]

Thomas Rast <trast@student.ethz.ch> skreiv Wed, 05 May 2010 16:00:03 +0200

> Leif Arne Storset wrote:
>> Was notes.rewrite. The environment variable refers to globs and refs,  
>> which are only mentioned by notes.rewriteRef; notes.rewrite is boolean.
>>
>> Signed-off-by: Leif Arne Storset <lstorset@opera.com>
>> ---
>> This should be a trivial fix.
>
> ACK and thanks for spotting this.  Putting it in the wrong place was
> my fault.
>
> I found the commit message confusing, though (my first thought was "we
> have a notes.rewrite configuration variable?"), and you also have a

Yeah, I misread it as notes.rewrite.

> way too long line there.  How about
>
>   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.

Thanks, looks good. I suppose I should file a PATCH v2 now, it'll be along  
in a minute.

-- 
Leif Arne Storset
Core Technology Developer, Opera Software
Oslo, Norway

[PATCH] Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef

[Leif Arne Storset]

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