From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Laxman Dewangan <ldewangan@nvidia.com>,
Linus Walleij <linus.walleij@linaro.org>,
"linux-kernel\@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-gpio\@vger.kernel.org" <linux-gpio@vger.kernel.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [GIT PULL] GPIO bulk changes for kernel v4.6
Date: Fri, 18 Mar 2016 10:16:55 -0700 [thread overview]
Message-ID: <xmqqk2kzr9iw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CA+55aFzVqPzEg6zq7sRweE7OCVKMJzM1eZRHXddMG+BabEDeCA@mail.gmail.com> (Linus Torvalds's message of "Fri, 18 Mar 2016 10:01:25 -0700")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> The code in the recursive merge that allows this to happen is this:
> ...
> And I do think that's right, and I think it's clever, and it goes back to 2006:
>
> 934d9a24078e merge-recur: if there is no common ancestor, fake empty one
>
> but I think there should be an option there.
Oh, I think everybody understands that and agrees by now.
prev parent reply other threads:[~2016-03-18 17:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CACRpkdbGkfJ9bW1db64msMeQjue+=y+op5EmSx62FWOWDOJwWg@mail.gmail.com>
[not found] ` <CA+55aFwV4Cq=4zJc6Fw0yAGrTmci_DFAjJKxkk05pjJJf3iYbA@mail.gmail.com>
[not found] ` <56EB9B0C.4050507@nvidia.com>
2016-03-18 7:15 ` [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds
2016-03-18 14:32 ` Johannes Schindelin
2016-03-18 15:43 ` Junio C Hamano
2016-03-18 15:47 ` Linus Torvalds
2016-03-18 16:37 ` Junio C Hamano
2016-03-18 17:01 ` Linus Torvalds
2016-03-18 17:16 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2kzr9iw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=ldewangan@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox