On Tue, Feb 8, 2011 at 3:48 PM, Jared Hance <jaredhance@xxxxxxxxx> wrote: > > Adds the option merge.defaultupstream to add support for merging from the Nit: I agree with Jeff[1] that this should be called merge.defaultToUpstream [1] http://article.gmane.org/gmane.comp.version-control.git/165745 j. -- 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