summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index f8763ee26..d6d238d83 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -218,7 +218,7 @@ def action_update(conf, args):
logger.debug("generated patch set:\n%s" % output)
patchlist = output.splitlines()
- rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range
+ rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range
revlist = runcmd(rev_cmd, ldir).splitlines()
# Step 3: Call repo specific hook to adjust patch