diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-22 17:15:05 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 12:13:08 +0000 |
| commit | ab69a16b21d0ce81458f6d3e6821e1800ee19a7c (patch) | |
| tree | cb7375c3795cb44a576bb691e4a8c03550ed42cf /meta-yocto/recipes-qt | |
| parent | fd3f7d5d6a6fd0c08f34e9eecfed6f9689e44e85 (diff) | |
| download | poky-ab69a16b21d0ce81458f6d3e6821e1800ee19a7c.tar.gz | |
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).
(From OE-Core rev: 6e70c95dc69be6708c3bc231cc2a99eac1360815)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/recipes-qt')
0 files changed, 0 insertions, 0 deletions