On Thu, Mar 24, 2011 at 9:39 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > "git merge" without specifying any commit is a no-op by default. > > A new option merge.defaultupstream can be set to true to cause such an > invocation of the command to merge the upstream branches configured for > the current branch by using their last observed values stored in their > remote tracking branches. FTR. It's actually merge.defaultotupstream, not merge.defaultupstream. -- 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