On Sat, May 08, 2010 at 10:32:24PM -0500, Jonathan Nieder wrote: > @@ -196,21 +196,13 @@ core.notesRef:: > command line. > > notes.displayRef:: > - The (fully qualified) refname from which to show notes when > - showing commit messages. The value of this variable can be set > - to a glob, in which case notes from all matching refs will be > - shown. You may also specify this configuration variable > - several times. A warning will be issued for refs that do not > - exist, but a glob that does not match any refs is silently > - ignored. > -+ > -This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` > -environment variable, which must be a colon separated list of refs or > -globs. > -+ > -The effective value of "core.notesRef" (possibly overridden by > -GIT_NOTES_REF) is also implicitly added to the list of refs to be > -displayed. > + Which ref (or refs, if a glob or specified more than once), in > + addition to the default set by `core.notesRef` or > + 'GIT_NOTES_REF', to read notes from when showing commit > + messages with the 'git log' family of commands. > + This setting can be overridden on the command line or by the > + 'GIT_NOTES_DISPLAY_REF' environment variable. > + See linkgit:git-log[1]. Hmm. Both this and 4/8 rewrite bits of the configuration copied from config.txt in an earlier patch. Do any changes need to be propagated back to config.txt (and no, I didn't read and think carefully, so the answer may be "no, they are now diverging intentionally")? -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html