diff --git a/llvm/utils/docker/build_docker_image.sh b/llvm/utils/docker/build_docker_image.sh
--- a/llvm/utils/docker/build_docker_image.sh
+++ b/llvm/utils/docker/build_docker_image.sh
@@ -96,7 +96,7 @@
       DOCKER_TAG="$1"
       shift
       ;;
-    -r|--revision|-c|-cherrypick|-b|--branch)
+    -r|--revision|-c|--cherrypick|-b|--branch)
       CHECKOUT_ARGS="$CHECKOUT_ARGS $1 $2"
       shift 2
       ;;
diff --git a/llvm/utils/docker/scripts/checkout.sh b/llvm/utils/docker/scripts/checkout.sh
--- a/llvm/utils/docker/scripts/checkout.sh
+++ b/llvm/utils/docker/scripts/checkout.sh
@@ -83,7 +83,7 @@
   # This function is always called on a sorted list of cherrypicks.
   for CHERRY_REV in $CHERRYPICKS; do
     echo "Cherry-picking $CHERRY_REV into $CHECKOUT_DIR"
-    git cherry-pick $CHERRY_REV
+    EMAIL="someone@somewhere.net" git cherry-pick $CHERRY_REV
   done
 
   popd