From: Travis Cross <tc@traviscross.com>
Date: Thu, 8 Apr 2010 19:49:24 +0000 (+0000)
Subject: Clarify the syntax for git merge.
X-Git-Tag: git2svn-syncpoint-master~238^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b83541f7977f4b3e760adb7947418e30ec39454;p=thirdparty%2Ffreeswitch.git

Clarify the syntax for git merge.
---

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