diff --git a/git-subtree.sh b/git-subtree.sh index 11cda9ea82..009c0db9bc 100755 --- a/git-subtree.sh +++ b/git-subtree.sh @@ -603,7 +603,11 @@ cmd_merge() rev="$new" fi - git merge -s subtree --message="$message" $rev + if [ -n "$message" ]; then + git merge -s subtree --message="$message" $rev + else + git merge -s subtree $rev + fi } cmd_pull()