git merge documentation: -m is optional

diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 43f8c2593dcc010b97b24cc8f5ca1caada7bef3b..37fbf66efb91ff74bf57d1b33b5ab95a248713cd 100644 (file)
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -33,7 +33,7 @@ EXAMPLE
 -------
 
 Given a commit, find out where it is relative to the local refs. Say somebody
-wrote you about that phantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a.
+wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a.
 Of course, you look into the commit, but that only tells you what happened, but
 not the context.