From 3b83541f7977f4b3e760adb7947418e30ec39454 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 8 Apr 2010 19:49:24 +0000
Subject: [PATCH] Clarify the syntax for git merge.

---
 scripts/setup-git.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/setup-git.sh b/scripts/setup-git.sh
index 9781417f98..1a5e36d339 100755
--- 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