git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dustin Sallings <dustin@spy.net>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Dustin Sallings <dustin@spy.net>
Subject: [PATCH] Doc: Mention branch.<name>.rebase applies to "git pull"
Date: Thu,  8 May 2008 11:28:07 -0700	[thread overview]
Message-ID: <1210271287-36719-2-git-send-email-dustin@spy.net> (raw)
In-Reply-To: <7vprrycce9.fsf@gitster.siamese.dyndns.org>

Signed-off-by: Dustin Sallings <dustin@spy.net>
---
 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.<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).
-- 
1.5.5.1.100.g65b98

      parent reply	other threads:[~2008-05-08 18:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-29 20:49 [PATCH] Allow local branching to set up rebase by default Dustin Sallings
2008-04-29 21:56 ` Jay Soffian
     [not found]   ` <02471C27-C99D-43E7-BC58-50F2B86ED159@spy.net>
2008-05-07  6:01     ` Dustin Sallings
2008-05-07 15:19       ` Junio C Hamano
2008-05-07 16:22 ` Junio C Hamano
2008-05-08 17:32   ` Dustin Sallings
2008-05-08 18:23     ` Junio C Hamano
2008-05-08 18:28   ` [PATCH] Allow tracking branches " Dustin Sallings
2008-05-10 18:41     ` Junio C Hamano
2008-05-10 22:36       ` Dustin Sallings
2008-05-10 22:36       ` Dustin Sallings
2008-05-08 18:28   ` Dustin Sallings [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1210271287-36719-2-git-send-email-dustin@spy.net \
    --to=dustin@spy.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).