From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Steven Grimm <koreth@midwinter.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
git@vger.kernel.org
Subject: Re: [PATCH v2] Teach 'git pull' about --rebase
Date: Wed, 28 Nov 2007 20:40:48 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711282039430.27959@racer.site> (raw)
In-Reply-To: <27E5EF3C-19EF-441C-BB12-0F5B29BEAEDB@midwinter.com>
Hi,
On Wed, 28 Nov 2007, Steven Grimm wrote:
> On Nov 28, 2007, at 5:11 AM, Johannes Schindelin wrote:
> > As a convenience, you can set the default behavior for a branch by
> > defining the config variable branch.<name>.rebase, which is
> > interpreted as a bool. This setting can be overridden on the command
> > line by --rebase and --no-rebase.
>
> I wonder if this shouldn't be branch.<name>.pulltype or something like
> that, so we can represent more than just "rebase or not." Values could
> be "rebase", "merge" (the default) and maybe even "manual" to specify
> that git-pull should neither merge nor rebase a particular branch even
> if it matches a wildcard refspec.
I am not convinced that this is a good thing... We already have
branch.<name>.mergeOptions for proper merges, and I want to make clear
that this is about rebase, and not about merge.
Ciao,
Dscho
next prev parent reply other threads:[~2007-11-28 20:41 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 22:54 [PATCH] Teach 'git pull' the '--rebase' option Johannes Schindelin
2007-10-25 23:04 ` Linus Torvalds
2007-10-25 23:10 ` Johannes Schindelin
2007-10-25 23:36 ` Linus Torvalds
2007-10-25 23:49 ` Linus Torvalds
2007-10-25 23:54 ` Junio C Hamano
2007-10-26 9:52 ` Johannes Schindelin
2007-11-28 0:11 ` Junio C Hamano
2007-11-28 13:11 ` [PATCH v2] Teach 'git pull' about --rebase Johannes Schindelin
2007-11-28 13:15 ` Jonathan del Strother
2007-11-28 14:02 ` Johannes Schindelin
2007-11-28 13:19 ` Jakub Narebski
2007-11-28 20:35 ` Steven Grimm
2007-11-28 20:40 ` Johannes Schindelin [this message]
2007-11-28 21:10 ` Lars Hjemli
2007-11-28 21:55 ` Junio C Hamano
2007-11-28 21:58 ` Johannes Schindelin
2007-11-28 22:06 ` Steven Grimm
2007-11-28 22:33 ` J. Bruce Fields
2007-11-28 22:47 ` J. Bruce Fields
2007-11-28 23:12 ` Johannes Schindelin
2007-11-28 23:32 ` Junio C Hamano
2007-11-28 23:56 ` J. Bruce Fields
2007-11-29 0:16 ` Johannes Schindelin
2007-11-29 8:36 ` Andreas Ericsson
2007-11-29 3:23 ` Nicolas Pitre
2007-11-28 21:59 ` Jon Loeliger
2007-11-28 22:02 ` Johannes Schindelin
2007-12-01 20:37 ` Björn Steinbrink
2007-12-03 13:10 ` Karl Hasselström
2007-10-26 11:43 ` [PATCH] Teach 'git pull' the '--rebase' option Jeff King
2007-10-26 11:45 ` Jeff King
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=Pine.LNX.4.64.0711282039430.27959@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=koreth@midwinter.com \
--cc=torvalds@linux-foundation.org \
/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).