From: Dustin Sallings <dustin@spy.net>
Date: Thu, 8 May 2008 18:28:07 +0000 (-0700)
Subject: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
X-Git-Tag: v1.5.5.2~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371?ds=inline;hp=--cc

Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"

Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 531ec46e95..ffa06366f5 100644
--- 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).