On Fri, Jun 28, 2013 at 5:41 PM, Junio C Hamano <gits...@pobox.com> wrote:
> John Keeping <j...@keeping.me.uk> writes:
>> I don't think "git pull remote branch" falls into the same category as
>> plain "git pull" so I'm not convinced that defaulting to merge there is
>> unreasonable. The original message about this  did talk about only
>> "git pull" with no arguments.
> If you want to limit the scope to only "git pull" (without any
> command line argument), I actually do not have strong preference for
> or against it either way. Perhaps a follow-up patch to be squashed?
I do. Whether the user does 'git pull' or 'git pull origin' doesn't
matter, we still want to reject non-fast-forward merges.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html