Clarify the syntax for git merge.

2010-04-08 19:49:24 +00:00 · 2010-04-08 19:49:24 +00:00 · 3b83541f79
parent 355b4f111f
commit 3b83541f79
1 changed files with 1 additions and 1 deletions
--- 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