]> code.ossystems Code Review - openembedded-core.git/commit
Code Review / openembedded-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 4600717) | patch
kern-tools: re-enable scc merge command
authorBruce Ashfield <bruce.ashfield@windriver.com>
Wed, 1 Feb 2017 15:30:29 +0000 (10:30 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 5 Feb 2017 09:20:20 +0000 (09:20 +0000)
commita0059ebbb52c659282e355664bba1a2fa282170e
treeb77b27f7016a31d937a0e75e3fc59497f753eabftree | snapshot
parent460071785c58de6d45698046e70f1121438537cdcommit | diff
kern-tools: re-enable scc merge command

The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.

As was pointed out by David Vincent <freesilicon@gmail.com>, there is
once again a valid use case for this functionality, so we restore the
capability.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/kernel-yocto.bbclass diff | blob | history
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb diff | blob | history
Mirror of the official openembedded-core repository