diff options
| -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): branch = repo.get('branch', "master") runcmd("git checkout %s" % branch, ldir) logger.info("git pull for component repo %s in %s ..." % (name, ldir)) - output=runcmd("git pull", ldir) + output=runcmd("git pull --ff-only", ldir) logger.info(output) def action_update(conf, args): |