Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1360811
| From | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL] GPIO bulk changes for kernel v4.6 |
| Date | 2016-03-18 18:20 +0100 |
| Message-ID | <re6e6-2TF-5@gated-at.bofh.it> (permalink) |
| References | (3 earlier) <rdWRs-2n2-11@gated-at.bofh.it> <re3Jg-7pe-13@gated-at.bofh.it> <re4P0-Bh-9@gated-at.bofh.it> <re5Bp-1Rm-27@gated-at.bofh.it> <re64q-2I6-19@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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.
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-18 07:10 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Laxman Dewangan <ldewangan@nvidia.com> - 2016-03-18 07:30 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-18 08:20 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Johannes Schindelin <Johannes.Schindelin@gmx.de> - 2016-03-18 15:40 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Junio C Hamano <gitster@pobox.com> - 2016-03-18 16:50 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-18 16:50 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Junio C Hamano <gitster@pobox.com> - 2016-03-18 17:40 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-18 18:10 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Junio C Hamano <gitster@pobox.com> - 2016-03-18 18:20 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Walleij <linus.walleij@linaro.org> - 2016-03-18 10:10 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Laxman Dewangan <ldewangan@nvidia.com> - 2016-03-18 11:00 +0100
Re: [GIT PULL] GPIO bulk changes for kernel v4.6 Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-18 17:00 +0100
csiph-web