diff options
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 2d100bebdf..8637addc8e 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -587,7 +587,7 @@ def action_pull(conf, args): | |||
587 | branch = repo.get('branch', "master") | 587 | branch = repo.get('branch', "master") |
588 | runcmd("git checkout %s" % branch, ldir) | 588 | runcmd("git checkout %s" % branch, ldir) |
589 | logger.info("git pull for component repo %s in %s ..." % (name, ldir)) | 589 | logger.info("git pull for component repo %s in %s ..." % (name, ldir)) |
590 | output=runcmd("git pull", ldir) | 590 | output=runcmd("git pull --ff-only", ldir) |
591 | logger.info(output) | 591 | logger.info(output) |
592 | 592 | ||
593 | def action_update(conf, args): | 593 | def action_update(conf, args): |