Mailing-List: contact infrastructure-dev-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: infrastructure-dev@apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Sender: Brett Porter <brett@porterclan.net>
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Apple Message framework v1278)
Subject: Re: [1/2] git commit: f92a685 -
From: Brett Porter <brett@apache.org>
In-Reply-To: 
 <CAOFYJNY9DaMsqKEB+Qis_qdMMHcuoxU=ow1C4gq0RXFK=dPCSg@mail.gmail.com>
Date: Wed, 6 Jun 2012 22:45:26 +1000
Content-Transfer-Encoding: quoted-printable
Message-Id: <C9BA99EE-4761-40B9-BD7E-0E83FCC15153@apache.org>
References: <20120605175350.20B8DFFC3@tyr.zones.apache.org>
 <CABD8fLWJtumTw+0qvFOpenYg_xHaSTQuHUwDdEDphqrxQ3bF3g@mail.gmail.com>
 <1338922313.17426.YahooMailNeo@web160904.mail.bf1.yahoo.com>
 <31A3B1BB-1C82-41E6-B66D-0B01F58FD846@apache.org>
 <CAOFYJNY9DaMsqKEB+Qis_qdMMHcuoxU=ow1C4gq0RXFK=dPCSg@mail.gmail.com>
To: infrastructure-dev@apache.org


On 06/06/2012, at 10:23 PM, Jukka Zitting wrote:

> Hi,
>=20
> On Wed, Jun 6, 2012 at 2:08 AM, Brett Porter <brett@apache.org> wrote:
>> Joe, you probably want this if you use git pull:
>>=20
>>  git config branch.master.rebase true
>>=20
>> That makes it the equivalent of "git fetch origin; git rebase =
origin/master"
>> instead of fetch and merge, so your changes will be rewritten against =
the
>> latest commit and the merge commit omitted.
>=20
> I know there are many people who prefer rebase over merge for such
> cases, but personally I don't like it. Using rebase with Git is a bit
> like disabling or removing svn:mergeinfo properties in Subversion
> (which I've seem many people do because they don't understand the
> concept behind and the benefits of the feature).
>=20
> Much of the confusion with merge commits is just a result of tooling
> not keeping up with new concepts. A better notification mailer like
> the one I suggested makes such cases much easier to understand and
> handle.

Sorry, but I don't follow. I excluded work on different branches from =
this (which is what svn:mergeinfo represents).

Can you describe a use case where it is useful to retain merge =
information between master and origin/master on a clone?

Are you saying this is something you'd find helpful to you if other =
people on a project did, or that it's a preference you have for the way =
you work yourself?

Cheers,
Brett

--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
http://twitter.com/brettporter