GIT 1.5.5.4

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04c01c5fdca566b1760e8eed02687607017e89aa..273b3580692defede224001aa44d41603bfbf6ee 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -415,7 +415,8 @@ 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.
+       instead of merging the default branch from the default remote when
+       "git pull" is run.
        *NOTE*: this is a possibly dangerous operation; do *not* use
        it unless you understand the implications (see linkgit:git-rebase[1]
        for details).