diff --git a/hooks/post-checkout b/hooks/post-checkout
index 2f7fc45..af548ae 100755
--- a/hooks/post-checkout
+++ b/hooks/post-checkout
@@ -29,7 +29,10 @@ function merge() {
 
   git fetch -v origin "${target_branch}"
   git checkout FETCH_HEAD
-  GIT_COMMITTER_NAME="github-merged-pr-buildkite-plugin" git merge "${BUILDKITE_COMMIT}"
+  GIT_COMMITTER_EMAIL="auto-merge@buildkite" \
+  GIT_AUTHOR_NAME="github-merged-pr-buildkite-plugin" \
+  GIT_COMMITTER_NAME="github-merged-pr-buildkite-plugin" \
+  git merge --no-edit "${BUILDKITE_COMMIT}"
 }
 
 force_merge="${GITHUB_MERGED_PR_FORCE_BRANCH:-}"