summaryrefslogtreecommitdiff
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-22 17:15:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:07:25 +0000
commit6e70c95dc69be6708c3bc231cc2a99eac1360815 (patch)
tree063f22587d4942d32a317462a2ffe654c9845093 /meta/conf/machine
parentb03e710c88ad0c66cf731647f26e8441d0074cae (diff)
downloadopenembedded-core-6e70c95dc69be6708c3bc231cc2a99eac1360815.tar.gz
openembedded-core-6e70c95dc69be6708c3bc231cc2a99eac1360815.tar.bz2
openembedded-core-6e70c95dc69be6708c3bc231cc2a99eac1360815.tar.xz
openembedded-core-6e70c95dc69be6708c3bc231cc2a99eac1360815.zip
scripts/combo-layer: handle diffs in commit messages
A few recent commits in the OE-Core repository contain diffs in their commit messages, which totally confuses git-am when applying them to the combo repository during update. Add some code to detect and indent any diff text in the commit message so that this does not happen (and show a warning). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
0 files changed, 0 insertions, 0 deletions