diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-12 06:54:02 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-12 06:54:02 +0100 |
| commit | c91737585e8bb5874fef84f59934e007146d2605 (patch) | |
| tree | ef780a8c35bf107872edd026e9393ed3d2d9a7bc | |
| parent | 6f23ebd171c2c2bdfa9538d0e7e38868aa5cf298 (diff) | |
Add the '--no-ff' option ot the git merge command in order to create thev0.3
git commit in all the cases. The makes the push post-hook message much
more clear.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
| -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" |