From: David Galloway Date: Wed, 18 May 2022 21:25:38 +0000 (-0400) Subject: ceph-tag: Provide a message when merging X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95c57c34392cc77b74140a3dfef1ac82d015f3a4;p=ceph-build.git ceph-tag: Provide a message when merging Signed-off-by: David Galloway --- diff --git a/ansible/roles/ceph-release/tasks/push.yml b/ansible/roles/ceph-release/tasks/push.yml index a14b584fa..023fc13f4 100644 --- a/ansible/roles/ceph-release/tasks/push.yml +++ b/ansible/roles/ceph-release/tasks/push.yml @@ -48,7 +48,7 @@ # In case any commits got pushed to {{ branch }} while we were building - name: "merge {{ branch }}-release changes back into {{ branch }}" - command: git merge {{ branch }}-release + command: git merge -m "Merging {{ branch }}-release {{ version }} commit into {{ branch }}" {{ branch }}-release args: chdir: ceph