Revision
17253
Author
tc
Date
2010-04-08 14:49:49 -0500 (Thu, 08 Apr 2010)

Log Message

Clarify the syntax for git merge.

Modified Paths

Property Changed

Diff

Modified: freeswitch/trunk/scripts/setup-git.sh (17252 => 17253)


--- freeswitch/trunk/scripts/setup-git.sh	2010-04-08 19:44:05 UTC (rev 17252)
+++ freeswitch/trunk/scripts/setup-git.sh	2010-04-08 19:49:49 UTC (rev 17253)
@@ -49,7 +49,7 @@
 
     If you really want to merge rather than rebasing, run:
 
-      git merge [refspec]
+      git merge <commit>
 
     See 'man git-config' for more information.
 EOF