From: Chris Packham <judge.packham@gmail.com>
To: git@vger.kernel.org
Cc: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Documentation/git-am: Document supported --patch-format options
Date: Sun, 16 Mar 2014 20:59:14 +1300 [thread overview]
Message-ID: <532559D2.3050802@gmail.com> (raw)
In-Reply-To: <1394509917-9679-1-git-send-email-judge.packham@gmail.com>
On 11/03/14 16:51, Chris Packham wrote:
> The --patch-format option has been supported for a while but it is not
> mentioned in the man page and the short help cannot tell the user what
> the supported formats are. Add the option to the man page along with the
> supported options.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
> I've not bothered to actually explain what the options mean. I'm not
> sure if readers will care aside from just trying them until one works
> (that's all I did when I had a patch that failed detection).
>
> Documentation/git-am.txt | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index 54d8461..76bd359 100644
> --- a/Documentation/git-am.txt
> +++ b/Documentation/git-am.txt
> @@ -12,9 +12,9 @@ SYNOPSIS
> 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
> [--3way] [--interactive] [--committer-date-is-author-date]
> [--ignore-date] [--ignore-space-change | --ignore-whitespace]
> - [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
> - [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
> - [--[no-]scissors]
> + [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]
> + [--directory=<dir>] [--exclude=<path>] [--include=<path>]
> + [--reject] [-q | --quiet] [--[no-]scissors]
> [(<mbox> | <Maildir>)...]
> 'git am' (--continue | --skip | --abort)
>
> @@ -97,6 +97,12 @@ default. You can use `--no-utf8` to override this.
> program that applies
> the patch.
>
> +--patch-format::
> + By default the command will try to detect the patch format
> + automatically. This option allows the user to bypass the automatic
> + detection and specify the patch format that the patch(es) should be
> + intepreted as. Valid formats are mbox, stgit, stgit-series and hg.
> +
> -i::
> --interactive::
> Run interactively.
>
Ping?
Actually now that I have the patch in a MUA I see the a simple
s/intepreted/interpreted/ fixup is required.
next prev parent reply other threads:[~2014-03-16 7:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 3:51 [PATCH] Documentation/git-am: Document supported --patch-format options Chris Packham
2014-03-16 7:59 ` Chris Packham [this message]
2014-03-17 6:39 ` Junio C Hamano
2014-03-17 7:35 ` Chris Packham
2014-03-17 7:50 ` [PATCH] fixup! " Chris Packham
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=532559D2.3050802@gmail.com \
--to=judge.packham@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=giuseppe.bilotta@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).