Clarify the syntax for git merge.

diff --git a/scripts/setup-git.sh b/scripts/setup-git.sh
index 9781417f98e52e4409e1f9543c4a40a87d511a25..1a5e36d3398a12240d7aabec3a69b34996dcd31d 100755 (executable)
--- a/scripts/setup-git.sh
+++ b/scripts/setup-git.sh
@@ -49,7 +49,7 @@ cat 1>&2 <<EOF
 
     If you really want to merge rather than rebasing, run:
 
-      git merge [refspec]
+      git merge <commit>
 
     See 'man git-config' for more information.
 EOF