diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-12 09:04:29 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-12 09:04:29 +0100 |
| commit | 9e1e53fbf8a9c4f06c386cae3929629a57203288 (patch) | |
| tree | 003ba94643ea7f51164cc12bad1d23dbe583bce7 | |
| parent | 296fcca39754956204d30d57c668530bb556046b (diff) | |
| parent | c91737585e8bb5874fef84f59934e007146d2605 (diff) | |
Merge commit 'v0.2-12-gc917375' into dpkg
| -rwxr-xr-x | pmwg-ci-integ | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pmwg-ci-integ b/pmwg-ci-integ index e2130eb..ef4b273 100755 --- a/pmwg-ci-integ +++ b/pmwg-ci-integ @@ -319,7 +319,7 @@ while read LINE; do echo "Merging $REMOTE_NAME/$REMOTE_BRANCH" - git merge --no-edit $REMOTE_NAME/$REMOTE_BRANCH + git merge --no-ff --no-edit $REMOTE_NAME/$REMOTE_BRANCH if [ $? -ne 0 ]; then echo "Merge failed, manual merge" xterm -e "git mergetool -y" |