Le Saturday 08 November 2008 16:08:41 Johannes Schindelin, vous avez écrit : > Hi, > > On Fri, 7 Nov 2008, Stephen Haberman wrote: > > Awhile ago I brought up wanting to have a "rebase with preserve merges" > > option for `git pull` > > That might be something you want, but you cannot call it > > git pull --preserve-merges > > since everybody used to "pull = fetch && merge" would go "Huh? A merge > _does_ preserve merges". > > If at all, you could call it "--rebase=preserve-merges". > Why not --rebase --keep-merges? Personnally, I think it makes things clearer since in general options are either standalone or have a value. -- fge -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html