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