On Thu, May 23, 2013 at 4:55 PM, John Keeping <john@xxxxxxxxxxxxx> wrote: > So I was asking if it would be sensible (possibly in Git 2.0) to make > git-pull pass --ff-only to git-merge by default. Definitely yes. -- Felipe Contreras -- 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