From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Oct 2007 22:28:05 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <7vir5qqxl6.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <550f9510710011441t1eb50352ofc8db77f79d794d5@mail.gmail.com>

"Tom Clarke" <tom@u2i.com> writes:

> I'm happy to try to address the issues you raised, but I wonder if we
> would do better to look back at my original proposal which was to add
> a --rebase option to git-pull. git-pull is the main place there I see
> need for using a rebase instead of a merge, as anywhere where you
> might use git-merge directly, if what you really want is a rebase, you
> can just run git-rebase.

Yeah, we have taught "git-pull == git-fetch + git-merge" to our
users, and "-s strategy" has been a way to specify _how_ the
merge is done, and not about doing something that is not a
merge.

As you say, rebase is not doing a merge.  But neither is "squash".

"git-pull --rebase == git-fetch + git-rebase" might be simpler
for end users to understand.  I dunno.