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>
Dustin Sallings committed
May 8, 2008 at 11:28 UTC
15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371
1 file changed
+2
-1
Documentation/config.txt
+2
-1
@@ -362,7 +362,8 @@ branch.<name>.mergeoptions::
362
363
branch.<name>.rebase::
364
When true, rebase the branch <name> on top of the fetched branch,
365
- instead of merging the default branch from the default remote.
365
+ instead of merging the default branch from the default remote when
366
+ "git pull" is run.
367
*NOTE*: this is a possibly dangerous operation; do *not* use
368
it unless you understand the implications (see linkgit:git-rebase[1]
369
for details).