diff options
| author |  Dustin Sallings <dustin@spy.net> | 2008-05-08 11:28:07 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-08 12:15:30 -0700 |
| commit | 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 (patch) | |
| tree | 24dee11461863877f6f32ca9e95cf9192ff86c8c /Documentation | |
| parent | doc: clarify definition of "update" for git-add -u (diff) | |
| download | tgif-15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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). |