[PATCH 3/6] Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include options

From

sorganov@gmail.com <sorganov@gmail.com>

Date

Oct 5, 2016, 14:46 UTC

Message-ID

<daa9f1869b6c35b1b74ee9b43c4862439af42483.1475678515.git.sorganov@gmail.com>

In-Reply-To

<cover.1475678515.git.sorganov@gmail.com>

From: Sergey Organov <sorganov@gmail.com>

Signed-off-by: Sergey Organov <sorganov@gmail.com>
---
 Documentation/git-merge.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 90342eb..216d2f4 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [options] [-m <msg>] [<commit>...]
-'git merge' <msg> HEAD <commit>...
+'git merge' [options] <msg> HEAD <commit>...
 'git merge' --abort
 
 DESCRIPTION

-- 
2.10.0.1.g57b01a3