{"thread":{"id":"36115","subject":"[PATCH] Documentation/git-am: Document supported --patch-format options","startedAt":"2014-03-11T03:51:57Z","lastAt":"2014-03-17T07:50:49Z","messageCount":5,"participants":["Chris Packham","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"236480","messageId":"1394509917-9679-1-git-send-email-judge.packham@gmail.com","threadId":"36115","inReplyTo":null,"subject":"[PATCH] Documentation/git-am: Document supported --patch-format options","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2014-03-11T03:51:57Z","receivedAt":"2014-03-11T03:51:57Z","isPatch":true,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"The --patch-format option has been supported for a while but it is not\nmentioned in the man page and the short help cannot tell the user what\nthe supported formats are. Add the option to the man page along with the\nsupported options.\n\nSigned-off-by: Chris Packham <judge.packham@gmail.com>\n---\nI've not bothered to actually explain what the options mean. I'm not\nsure if readers will care aside from just trying them until one works\n(that's all I did when I had a patch that failed detection).\n\n Documentation/git-am.txt |   12 +++++++++---\n 1 file changed, 9 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 54d8461..76bd359 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -12,9 +12,9 @@ SYNOPSIS\n 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n \t [--3way] [--interactive] [--committer-date-is-author-date]\n \t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n-\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n-\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n-\t [--[no-]scissors]\n+\t [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]\n+\t [--directory=<dir>] [--exclude=<path>] [--include=<path>]\n+\t [--reject] [-q | --quiet] [--[no-]scissors]\n \t [(<mbox> | <Maildir>)...]\n 'git am' (--continue | --skip | --abort)\n \n@@ -97,6 +97,12 @@ default.   You can use `--no-utf8` to override this.\n \tprogram that applies\n \tthe patch.\n \n+--patch-format::\n+\tBy default the command will try to detect the patch format\n+\tautomatically. This option allows the user to bypass the automatic\n+\tdetection and specify the patch format that the patch(es) should be\n+\tintepreted as. Valid formats are mbox, stgit, stgit-series and hg.\n+\n -i::\n --interactive::\n \tRun interactively.\n-- \n1.7.9.5\n"},{"id":"236819","messageId":"532559D2.3050802@gmail.com","threadId":"36115","inReplyTo":"1394509917-9679-1-git-send-email-judge.packham@gmail.com","subject":"Re: [PATCH] Documentation/git-am: Document supported --patch-format options","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2014-03-16T07:59:14Z","receivedAt":"2014-03-16T07:59:14Z","isPatch":true,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On 11/03/14 16:51, Chris Packham wrote:\n> The --patch-format option has been supported for a while but it is not\n> mentioned in the man page and the short help cannot tell the user what\n> the supported formats are. Add the option to the man page along with the\n> supported options.\n> \n> Signed-off-by: Chris Packham <judge.packham@gmail.com>\n> ---\n> I've not bothered to actually explain what the options mean. I'm not\n> sure if readers will care aside from just trying them until one works\n> (that's all I did when I had a patch that failed detection).\n> \n>  Documentation/git-am.txt |   12 +++++++++---\n>  1 file changed, 9 insertions(+), 3 deletions(-)\n> \n> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\n> index 54d8461..76bd359 100644\n> --- a/Documentation/git-am.txt\n> +++ b/Documentation/git-am.txt\n> @@ -12,9 +12,9 @@ SYNOPSIS\n>  'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n>  \t [--3way] [--interactive] [--committer-date-is-author-date]\n>  \t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n> -\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n> -\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n> -\t [--[no-]scissors]\n> +\t [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]\n> +\t [--directory=<dir>] [--exclude=<path>] [--include=<path>]\n> +\t [--reject] [-q | --quiet] [--[no-]scissors]\n>  \t [(<mbox> | <Maildir>)...]\n>  'git am' (--continue | --skip | --abort)\n>  \n> @@ -97,6 +97,12 @@ default.   You can use `--no-utf8` to override this.\n>  \tprogram that applies\n>  \tthe patch.\n>  \n> +--patch-format::\n> +\tBy default the command will try to detect the patch format\n> +\tautomatically. This option allows the user to bypass the automatic\n> +\tdetection and specify the patch format that the patch(es) should be\n> +\tintepreted as. Valid formats are mbox, stgit, stgit-series and hg.\n> +\n>  -i::\n>  --interactive::\n>  \tRun interactively.\n> \n\nPing?\n\nActually now that I have the patch in a MUA I see the a simple\ns/intepreted/interpreted/ fixup is required.\n"},{"id":"236855","messageId":"7vlhw92us1.fsf@alter.siamese.dyndns.org","threadId":"36115","inReplyTo":"532559D2.3050802@gmail.com","subject":"Re: [PATCH] Documentation/git-am: Document supported --patch-format options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-03-17T06:39:42Z","receivedAt":"2014-03-17T06:39:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Chris Packham <judge.packham@gmail.com> writes:\n\n> Ping?\n\nHasn't it been already cooking in 'next' for a few days?\n"},{"id":"236859","messageId":"5326A5DB.5070407@gmail.com","threadId":"36115","inReplyTo":"7vlhw92us1.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/git-am: Document supported --patch-format options","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2014-03-17T07:35:55Z","receivedAt":"2014-03-17T07:35:55Z","isPatch":true,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On 17/03/14 19:39, Junio C Hamano wrote:\n> Chris Packham <judge.packham@gmail.com> writes:\n> \n>> Ping?\n> \n> Hasn't it been already cooking in 'next' for a few days?\n> \n\nIndeed I think I missed a \"What's cooking\". Do you want me to submit a\nfixup for the spelling mistake?\n"},{"id":"236860","messageId":"1395042649-16040-1-git-send-email-judge.packham@gmail.com","threadId":"36115","inReplyTo":"5326A5DB.5070407@gmail.com","subject":"[PATCH] fixup! Documentation/git-am: Document supported --patch-format options","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2014-03-17T07:50:49Z","receivedAt":"2014-03-17T07:50:49Z","isPatch":true,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"---\nOn 17/03/14 20:35, Chris Packham wrote:> On 17/03/14 19:39, Junio C Hamano wrote:\n>> Chris Packham <judge.packham@gmail.com> writes:\n>>\n>>> Ping?\n>>\n>> Hasn't it been already cooking in 'next' for a few days?\n>>\n> \n> Indeed I think I missed a \"What's cooking\". Do you want me to submit a\n> fixup for the spelling mistake?\n> \n\nMay as well just send it.\n\n Documentation/git-am.txt |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 76bd359..f8a7d0c 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -101,7 +101,7 @@ default.   You can use `--no-utf8` to override this.\n \tBy default the command will try to detect the patch format\n \tautomatically. This option allows the user to bypass the automatic\n \tdetection and specify the patch format that the patch(es) should be\n-\tintepreted as. Valid formats are mbox, stgit, stgit-series and hg.\n+\tinterpreted as. Valid formats are mbox, stgit, stgit-series and hg.\n \n -i::\n --interactive::\n-- \n1.7.9.5\n"}]}