[PATCH 3/6] Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include options
From: <hidden>
Date: 2016-10-05 14:54:59
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: Sergey Organov <redacted> Signed-off-by: Sergey Organov <redacted> --- 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