summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 84cc48f..d129175 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
for line in open(repo['patchlist']):
patchfile = line.split()[0]
lastrev = line.split()[1]
- cmd = "git am -s -p1 %s" % patchfile
+ cmd = "git am --keep-cr -s -p1 %s" % patchfile
logger.info("Apply %s" % patchfile )
try:
runcmd(cmd)
OpenPOWER on IntegriCloud