On Thu, May 23, 2013 at 5:21 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> I would assume that "no-ff" above was meant to be "--ff-only" from
> the first part of the message.
Yeah, I may need more coffee..
> I also would assume that I can rephrase that setting pull.merge
> (which does not exist) as setting pull.rebase explicitly to false
> instead (i.e. missing pull.rebase and pull.rebase that is explicitly
> set to false would mean two different things).
Yeah, sounds good to me, and doesn't really sound like it would
confuse/annoy anybody as long as it was clearly documented.
Linus
--
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