diff options
| author | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-13 09:09:32 +0000 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-13 09:14:24 +0000 |
| commit | dc4cbd9fb654c1c0e06f7ea3183602fa714c4cb6 (patch) | |
| tree | 50347417078e8ad2cb5ed6977af87d066e09f14d /scripts | |
| parent | 7253baaa602d557ba2853b6b22074a4aa1f4923a (diff) | |
Add no-ff in merge
Always create a commit.
Change-Id: Ie12c8d1fb0b8a63b71657863aec58046c1d1d366
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/coin/create_baseline/create_baseline.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/coin/create_baseline/create_baseline.sh b/scripts/coin/create_baseline/create_baseline.sh index 035890eb..d30e05ad 100755 --- a/scripts/coin/create_baseline/create_baseline.sh +++ b/scripts/coin/create_baseline/create_baseline.sh @@ -53,7 +53,7 @@ cd $repodir git checkout production 1>/dev/null git fetch 1>/dev/null git reset --hard origin/production 1>/dev/null -git merge origin/master --no-edit 1>/dev/null +git merge origin/master --no-ff --no-edit 1>/dev/null # amend commit template commit_msg="$(cat $commit_template_file && echo "" && cat $basepath/schedules/run_builds | egrep -v '(^#.*|^$)')" |