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 84cc48f6ff..d1291751fa 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
254 for line in open(repo['patchlist']): 254 for line in open(repo['patchlist']):
255 patchfile = line.split()[0] 255 patchfile = line.split()[0]
256 lastrev = line.split()[1] 256 lastrev = line.split()[1]
257 cmd = "git am -s -p1 %s" % patchfile 257 cmd = "git am --keep-cr -s -p1 %s" % patchfile
258 logger.info("Apply %s" % patchfile ) 258 logger.info("Apply %s" % patchfile )
259 try: 259 try:
260 runcmd(cmd) 260 runcmd(cmd)