From: Philippe Vaucher <philippe.vaucher@gmail.com>
Date: Fri, 07 Oct 2011 06:46:34 GMT
Subject: Re: Pull --rebase looses merge information
Message-ID: <CAGK7Mr5K63s78nt+UBC45_Ec1v-yfQMQK6+Wb-itu_rJHVPDgw@mail.gmail.com>
In-Reply-To: <201110062031.p96KVvsv018248@no.baka.org>

> I personally believe all pull should be --rebase, all merges should be
> --no-ff, and all rebases should be -p.  At least by default.  But that
> is just me.

+1

Philippe