From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 May 2013 00:24:04 GMT
Subject: Re: first parent, commit graph layout, and pull merge direction
Message-ID: <CA+55aFzpT8b1E9PxJmCmfEg3k7yMX7iRcQQebV_6ZmwCwgqb9w@mail.gmail.com>
In-Reply-To: <7vppwhb52f.fsf@alter.siamese.dyndns.org>

On Thu, May 23, 2013 at 5:21 PM, Junio C Hamano <gitster@pobox.com> 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