diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-11-02 13:50:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-07 14:05:35 +0000 |
| commit | 2293acaa7fb40fd5aad8a0e5deda6bc1097067b9 (patch) | |
| tree | 0685e0b5882ec3441bce3959a991d57aa928f67b /scripts/runqemu-addptable2image | |
| parent | 426ad821065c50fc008a140e5b2334d2c97511c3 (diff) | |
| download | poky-2293acaa7fb40fd5aad8a0e5deda6bc1097067b9.tar.gz | |
scripts/combo-layer: ignore merge commits
The combo-layer tool had trouble handling merge commits as they were
included in the revision list but not the patches; these are now
excluded from the revision list. Note however that this will not handle
merge commits that resolved a conflict; since "git format-patch" cannot
construct a linear change history over such merges there is nothing we
can currently do with these.
(From OE-Core rev: b6b6b215675631d0e505ffc8b4890f85fb3169f9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-addptable2image')
0 files changed, 0 insertions, 0 deletions