Messages in this thread | | | Date | Mon, 13 Dec 2010 23:31:09 -0500 | Subject | Re: [PATCH v6 0/5] da850-evm: add gpio-{keys,leds} for UI and BB expanders | From | Ben Gardiner <> |
| |
On Mon, Dec 13, 2010 at 4:53 PM, Kevin Hilman <khilman@deeprootsystems.com> wrote: > Ben Gardiner <bengardiner@nanometrics.ca> writes: > [...] > Yes, there will be double commits in master, because of the way I manage > master using 'git merge -ours'. But there shouldn't be double commits > between my "rebuild from braches" merges. It can be confusing, but if > you look at the history with a graphical tool like 'gitk', it might shed > some light on what is going on.
Ok. I'll consider a graphical investigation. Thanks for confirming the state of master is as-designed.
> I know it's confusing, but the davinci-next branch is the only important > branch in this tree for upstream purposes.
Understood. Thanks for the clarification.
Best Regards, Ben Gardiner
--- Nanometrics Inc. http://www.nanometrics.ca -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |