git-send-email: configurable bcc and chain-reply-to

diff --git a/git-merge.sh b/git-merge.sh
index 498c938c4507ccdc27f5a9e30e85f013a067c876..6ce62c860a3732e1239e216fb7492a126216be67 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -294,7 +294,12 @@ f,*)
        git-update-index --refresh 2>/dev/null
        new_head=$(git-rev-parse --verify "$1^0") &&
        git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-       finish "$new_head" "Fast forward"
+       msg="Fast forward"
+       if test -n "$have_message"
+       then
+               msg="$msg (no commit created; -m option ignored)"
+       fi
+       finish "$new_head" "$msg" || exit
        dropsave
        exit 0
        ;;