[OE-core] [PATCH 0/2] combo-layer pull changes

[Markus Lehtonen]

These patches are an effort to make combo-layer pull operation a bit more
predictable. The first patch avoids unwanted merge commits in local component
repositories by requiring fast-forward when pulling. The second patch adds a
--hard-reset command line option to make sure that the local component
repositories are always in sync with the remote.


The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da:

  file: fix long-options (2015-07-07 23:57:14 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib marquiz/combo-layer


Markus Lehtonen (2):
  combo-layer: only allow fast-forward when pulling
  combo-layer: implement --hard-reset option

 scripts/combo-layer | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

-- 
2.1.4