From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: Kevin Bracey <kevin@bracey.fi>,
git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH] am: replace uses of --resolved with --continue
Date: Thu, 27 Jun 2013 09:36:18 -0700 [thread overview]
Message-ID: <7vvc4ztssd.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130627083346.GB2232@serenity.lan> (John Keeping's message of "Thu, 27 Jun 2013 09:33:46 +0100")
John Keeping <john@keeping.me.uk> writes:
>> @@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways:
>>
>> . hand resolve the conflict in the working directory, and update
>> the index file to bring it into a state that the patch should
>> - have produced. Then run the command with the '--resolved' option.
>> + have produced. Then run the command with the '--continue' option.
>
> It isn't new in this patch, but there is an inconsistency in the quoting
> of the options here. In the previous hunk we use backticks but here it
> uses SQs.
Whatever the user is expected to literally type, like the dashed options,
should be typeset in tt so `--continue` is the right form.
I am not inviting anybody to throw a patch that was generated by
blindly running:
sed -e "s/'\(--[a-z_]*\)'/`\1`/g"
to touch 50+ files without thinking, by the way. It is so easy that
it can even be done by a trained monkey, but it also is very easy to
fail to spot misconversion. Done in small batches with a throttled
rate of patchflow, we may have sufficient review bandwidth to audit
them.
prev parent reply other threads:[~2013-06-27 16:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-26 20:06 [PATCH] am: replace uses of --resolved with --continue Kevin Bracey
2013-06-27 8:33 ` John Keeping
2013-06-27 16:36 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvc4ztssd.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=kevin@bracey.fi \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).