Messages in this thread | | | From | Junio C Hamano <> | Subject | Re: [GIT PULL] GPIO bulk changes for kernel v4.6 | Date | Fri, 18 Mar 2016 10:16:55 -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.
| |