From: Matthias Lederhofer <matled@gmx.net>
Date: Mon, 5 Feb 2007 11:37:27 +0000 (+0100)
Subject: git merge documentation: -m is optional
X-Git-Tag: v1.5.0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e8b0d486e9b244eb1692886ffb50ef728696c52;p=git.git

git merge documentation: -m is optional

Changed -m=<msg> to -m <msg> too.

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c08a6f7d..e53ff4b4e 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-	-m=<msg> <remote> <remote>...
+	[-m <msg>] <remote> <remote>...
 
 DESCRIPTION
 -----------