All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] git merge documentation: -m is optional
@ 2007-02-05 11:37 Matthias Lederhofer
  2007-02-12 17:07 ` Matthias Lederhofer
  0 siblings, 1 reply; 4+ messages in thread
From: Matthias Lederhofer @ 2007-02-05 11:37 UTC (permalink / raw)
  To: git

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

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
 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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] git merge documentation: -m is optional
  2007-02-05 11:37 [PATCH] git merge documentation: -m is optional Matthias Lederhofer
@ 2007-02-12 17:07 ` Matthias Lederhofer
  2007-02-12 21:56   ` Junio C Hamano
  2007-02-13  9:46   ` Matthias Lederhofer
  0 siblings, 2 replies; 4+ messages in thread
From: Matthias Lederhofer @ 2007-02-12 17:07 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Is anything wrong with this documentation update?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] git merge documentation: -m is optional
  2007-02-12 17:07 ` Matthias Lederhofer
@ 2007-02-12 21:56   ` Junio C Hamano
  2007-02-13  9:46   ` Matthias Lederhofer
  1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2007-02-12 21:56 UTC (permalink / raw)
  To: Matthias Lederhofer; +Cc: git

Matthias Lederhofer <matled@gmx.net> writes:

> Is anything wrong with this documentation update?

Was dropped by accident, I think.  Care to resend?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] git merge documentation: -m is optional
  2007-02-12 17:07 ` Matthias Lederhofer
  2007-02-12 21:56   ` Junio C Hamano
@ 2007-02-13  9:46   ` Matthias Lederhofer
  1 sibling, 0 replies; 4+ messages in thread
From: Matthias Lederhofer @ 2007-02-13  9:46 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-02-13  9:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-05 11:37 [PATCH] git merge documentation: -m is optional Matthias Lederhofer
2007-02-12 17:07 ` Matthias Lederhofer
2007-02-12 21:56   ` Junio C Hamano
2007-02-13  9:46   ` Matthias Lederhofer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.