From: Dustin Sallings Date: Thu, 08 May 2008 18:28:07 GMT Subject: [PATCH] Doc: Mention branch..rebase applies to "git pull" Message-ID: <1210271287-36719-2-git-send-email-dustin@spy.net> In-Reply-To: <7vprrycce9.fsf@gitster.siamese.dyndns.org> Signed-off-by: Dustin Sallings --- Documentation/config.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 6413f70..44bd20b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -441,7 +441,8 @@ branch..mergeoptions:: branch..rebase:: When true, rebase the branch 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). -- 1.5.5.1.100.g65b98