From: Johannes Sixt <j6t@kdbg.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Eric Herman <eric@freesa.org>,
Sverre Rabbelier <srabbelier@gmail.com>,
Fernando Vezzosi <buccia@repnz.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase
Date: Sun, 06 Nov 2011 20:53:17 +0100 [thread overview]
Message-ID: <4EB6E5AD.7060605@kdbg.org> (raw)
In-Reply-To: <1320573010-12296-1-git-send-email-avarab@gmail.com>
Am 06.11.2011 10:50, schrieb Ævar Arnfjörð Bjarmason:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 5a841da..b2d7d92 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -677,7 +677,9 @@ 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 when
> - "git pull" is run.
> + "git pull" is run. See "pull.rebase" for doing this in a non
> + branch-specific manner.
> +
> *NOTE*: this is a possibly dangerous operation; do *not* use
> it unless you understand the implications (see linkgit:git-rebase[1]
> for details).
When you continue an indented item in a separate paragraph, then you
must not use an empty line, but have line with '+' and un-indented
continuation paragraphs. See examples in this file.
-- Hannes
next prev parent reply other threads:[~2011-11-06 19:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-05 15:35 [PATCH] pull: introduce a pull.rebase option to enable --rebase Ævar Arnfjörð Bjarmason
2011-11-05 15:55 ` Johannes Schindelin
2011-11-06 7:47 ` Junio C Hamano
2011-11-06 9:23 ` Sverre Rabbelier
2011-11-06 9:50 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2011-11-06 18:20 ` Junio C Hamano
2011-11-06 19:53 ` Johannes Sixt [this message]
2011-11-07 12:44 ` Ævar Arnfjörð Bjarmason
2011-11-07 16:44 ` Junio C Hamano
2011-11-07 18:48 ` Ævar Arnfjörð Bjarmason
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=4EB6E5AD.7060605@kdbg.org \
--to=j6t@kdbg.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=buccia@repnz.net \
--cc=eric@freesa.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=srabbelier@gmail.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).