From: "Tom Clarke" <tom@u2i.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
"Carl Worth" <cworth@cworth.org>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Adding rebase merge strategy
Date: Tue, 2 Oct 2007 12:29:42 +0200 [thread overview]
Message-ID: <550f9510710020329m7917dc9m2bb6cfc4055fea84@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0710021056280.28395@racer.site>
On 10/2/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> It's all about convenience: in many repos, I just to "git pull", because
> there is really only one upstream.
>
> But in one repo, the upstream is svn, and I mistakenly checked in a merge.
> Not wanting to know svn deeply, I have no nice way (as I would have with
> git) to cover up my mistake. So in this repo, I would have liked to set
> branch.master.mergeOptions to '-s rebase'.
That's a good point, in addition to being able to do a git pull that
uses rebase, it would be useful make this configurable so you can
always safely do 'git pull'.
So it's perhaps the question is whether rebasing should be treated as
a kind of merging, or as an alternative to merging when pulling.
Incidentally, are there any other cases other than pulling where using
rebase as an alternative merge strategy is useful?
-Tom
next prev parent reply other threads:[~2007-10-02 10:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 16:15 [PATCH] Adding rebase merge strategy Tom Clarke
2007-09-28 17:03 ` Johannes Schindelin
2007-09-28 17:18 ` Tom Clarke
2007-10-01 15:08 ` Tom Clarke
2007-10-01 15:50 ` Johannes Schindelin
2007-10-01 21:01 ` Junio C Hamano
2007-10-01 21:41 ` Tom Clarke
2007-10-01 22:17 ` Carl Worth
2007-10-01 22:21 ` Tom Clarke
2007-10-01 22:30 ` Shawn O. Pearce
2007-10-01 22:53 ` Carl Worth
2007-10-01 23:11 ` Junio C Hamano
2007-10-02 10:00 ` Johannes Schindelin
2007-10-02 10:29 ` Tom Clarke [this message]
2007-10-02 18:40 ` Junio C Hamano
2007-10-03 14:11 ` Tom Clarke
2007-10-03 15:54 ` Johannes Schindelin
2007-10-01 23:09 ` J. Bruce Fields
2007-10-01 22:28 ` Junio C Hamano
[not found] <11885023904126-git-send-email-tom@u2i.com>
2007-08-30 19:36 ` Tom Clarke
2007-08-30 19:53 ` Johannes Schindelin
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=550f9510710020329m7917dc9m2bb6cfc4055fea84@mail.gmail.com \
--to=tom@u2i.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=cworth@cworth.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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).