Skip to content

Commit 15ddb6f

Browse files
dustingitster
authored andcommitted
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
Signed-off-by: Dustin Sallings <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent afd899e commit 15ddb6f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/config.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ branch.<name>.mergeoptions::
362362

363363
branch.<name>.rebase::
364364
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.
366367
*NOTE*: this is a possibly dangerous operation; do *not* use
367368
it unless you understand the implications (see linkgit:git-rebase[1]
368369
for details).

0 commit comments

Comments
 (0)