Am 06.11.2011 10:50, schrieb Ævar Arnfjörð Bjarmason: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 5a841da..b2d7d92 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -677,7 +677,9 @@ branch.<name>.mergeoptions:: > branch.<name>.rebase:: > When true, rebase the branch <name> on top of the fetched branch, > instead of merging the default branch from the default remote when > - "git pull" is run. > + "git pull" is run. See "pull.rebase" for doing this in a non > + branch-specific manner. > + > *NOTE*: this is a possibly dangerous operation; do *not* use > it unless you understand the implications (see linkgit:git-rebase[1] > for details). When you continue an indented item in a separate paragraph, then you must not use an empty line, but have line with '+' and un-indented continuation paragraphs. See examples in this file. -- Hannes -- 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