From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:09:04 +0000 (-0700)
Subject: Merge branch 'tr/doc-note-rewrite' into maint-1.7.6
X-Git-Tag: v1.7.6.5~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/588150b0231ee342ed528292a2205f4049b3dcb1?ds=inline;hp=-c

Merge branch 'tr/doc-note-rewrite' into maint-1.7.6

* tr/doc-note-rewrite:
Documentation: basic configuration of notes.rewriteRef
---

588150b0231ee342ed528292a2205f4049b3dcb1
diff --combined Documentation/config.txt
index ae9913b034,cc39f8639a..87643882fc
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -678,7 -678,7 +678,7 @@@ branch.<name>.rebase:
  browser.<tool>.cmd::
  	Specify the command to invoke the specified browser. The
  	specified command is evaluated in shell with the URLs passed
 -	as arguments. (See linkgit:git-web--browse[1].)
 +	as arguments. (See linkgit:git-web{litdd}browse[1].)
  
  browser.<tool>.path::
  	Override the path for the given tool that may be used to
@@@ -1445,7 -1445,8 +1445,8 @@@ notes.rewriteRef:
  	You may also specify this configuration several times.
  +
  Does not have a default value; you must configure this variable to
- enable note rewriting.
+ enable note rewriting.  Set it to `refs/notes/commits` to enable
+ rewriting for the default commit notes.
  +
  This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
  environment variable, which must be a colon separated list of refs or