[PATCH] git merge documentation: -m is optional

Subsystems: documentation, the rest

STALE3711d

4 messages, 2 authors, 2016-06-15 · open the first message on its own page

[PATCH] git merge documentation: -m is optional

From: Matthias Lederhofer <hidden>
Date: 2016-06-15 22:42:52

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

Signed-off-by: Matthias Lederhofer <redacted>
---
 Documentation/git-merge.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c08a6f..e53ff4b 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
 -----------
-- 
1.5.0.rc3.544.g79b8

Re: [PATCH] git merge documentation: -m is optional

From: Matthias Lederhofer <hidden>
Date: 2016-06-15 22:42:53

Is anything wrong with this documentation update?

Re: [PATCH] git merge documentation: -m is optional

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:54

Matthias Lederhofer [off-list ref] writes:
Is anything wrong with this documentation update?
Was dropped by accident, I think.  Care to resend?

[PATCH] git merge documentation: -m is optional

From: Matthias Lederhofer <hidden>
Date: 2016-06-15 22:42:54

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

Signed-off-by: Matthias Lederhofer <redacted>
---
Here it is again.
---
 Documentation/git-merge.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c08a6f..e53ff4b 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
 -----------
-- 
1.5.0.rc3.544.g79b8
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help