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 13:58:38 +0000 |
| commit | b6b6b215675631d0e505ffc8b4890f85fb3169f9 (patch) | |
| tree | c36be5550e914b88455f15c86fde5f6a7e25d204 /scripts/combo-layer.conf.example | |
| parent | ddb825c87dd3e59d50841a993080a00d1459b1e7 (diff) | |
| download | openembedded-core-contrib-b6b6b215675631d0e505ffc8b4890f85fb3169f9.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts/combo-layer.conf.example')
0 files changed, 0 insertions, 0 deletions