3419 2012-11-13 18:37:16 +0000 Wrap git merge command 2013-03-19 13:16:00 +0000 1 1 6 Yocto Project Subprojects Kernel kernel-tooling 1.3 x86 Multiple RESOLVED FIXED Low normal 1.4 M6 1 dvhart bruce.ashfield yp.kernel.watcher yp.watcher --- --- --- oldest_to_newest 27410 0 dvhart 2012-11-13 18:37:16 +0000 In order to clean up the typical usage in the BSP scc files and provide a complete reference with which to model our documentation, the kernel-tools need to wrap the "git merge" command so that "merge" can be used in a parallel manner to "branch" within the BSP scc files. This also ensures safe usage which is important for a documented feature. 27439 1 bruce.ashfield 2012-11-14 18:14:59 +0000 accepting and adding the time estimate. 30249 2 bruce.ashfield 2013-02-28 14:07:06 +0000 This has been sent to the oe-core mailing list. 30843 3 bruce.ashfield 2013-03-19 13:16:00 +0000 commit c7ec19d55aca6c4b17073c5362fce5be61a89d82 Author: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Thu Feb 7 16:32:28 2013 -0500 scc: wrap git merge To allow for parameter validation and sanity checking, wrap "git merge" as a dedicated "merge" command instead of using the raw git fallback. This also makes it consistent with existing top level commands such as 'tag', 'branch', 'patch', etc. There are no changes to arguments, and existing 'git merge' commands continue to work with this change. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> :100755 100755 eabece4... 0de55a4... M tools/scc Documentation updates send to Scott as well.