diff options
| author |   Laszlo Papp <lpapp@kde.org> | 2013-12-24 12:44:10 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:32 +0000 |
| commit | 909486e124c2aa78be98ee20dd837c7bfc17aebe (patch) | |
| tree | 5c1c86a07b330b6e2a6aed111bd92f2c5131209d /meta/recipes-extended/lsb | |
| parent | 56236e74f0fe275c1e3e7b59f44ca55cba1d4e3b (diff) | |
| download | openembedded-core-contrib-909486e124c2aa78be98ee20dd837c7bfc17aebe.tar.gz | |
lib/oe/patch.py: Prefer "git am" over "git apply" when applying git patches
It is better to use "git am" when possible to preserve the commit messages and
the mail format in general for patches when those are present. A typical use
case is when developers would like to keep the changes on top of the latest
upstream, and they may occasionally need to rebase. This is not possible with
"git diff" and "diff" generated patches.
Since this is not always the case, the fallback would be the "git apply"
operation which is currently available.
(From OE-Core rev: 3a14b0943731822905e6d45b13d08a6e8237e2fe)
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lsb')
0 files changed, 0 insertions, 0 deletions