Documentation/config.txt: Mention branch.<name>.rebase applies to "gi…

…t pull" Signed-off-by: Dustin Sallings <dustin@spy.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · May 8, 2008 · 15ddb6f · 15ddb6f
1 parent afd899e
commit 15ddb6f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -362,7 +362,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).