All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
To: Paul Bolle <pebolle@tiscali.nl>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] Re: [TRIVIAL] Documentation: merge: one <remote> is required
Date: Tue, 11 Aug 2009 16:42:53 +0200	[thread overview]
Message-ID: <20090811144253.GA12956@vidovic> (raw)
In-Reply-To: <1249995838.1589.3.camel@localhost.localdomain>

The 11/08/09, Paul Bolle wrote:
> merge only requires one <remote>, so "<remote>..." should be used in the
> synopsis (and not "<remote> <remote>...").
> 

<...>

>  'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
> -	[-m <msg>] <remote> <remote>...
> +	[-m <msg>] <remote>...
>  'git merge' <msg> HEAD <remote>...

Shoudn't be 

   [-m <msg>] <remote> [<remote>...]

or

   [-m <msg>] <remote>[...]

instead?

-- 
Nicolas Sebrecht

  reply	other threads:[~2009-08-11 14:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-11 13:03 [PATCH] [TRIVIAL] Documentation: merge: one <remote> is required Paul Bolle
2009-08-11 14:42 ` Nicolas Sebrecht [this message]
2009-08-11 14:58   ` [PATCH] " Paul Bolle
2009-08-12  2:48     ` Junio C Hamano
2009-08-12 10:19       ` Jakub Narebski
2009-08-12 13:29         ` Nicolas Sebrecht
2009-08-12 10:56       ` Paul Bolle
2009-08-12 20:31         ` Junio C Hamano
2009-08-12 20:47           ` Paul Bolle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090811144253.GA12956@vidovic \
    --to=nicolas.s.dev@gmx.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pebolle@tiscali.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.