Re: [GIT PULL] GPIO bulk changes for kernel v4.6
From: Junio C Hamano
Date: Fri Mar 18 2016 - 13:17:03 EST
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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.