From: Junio C Hamano <gitster@pobox.com>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] docs: demonstrate difference between 'am' and 'apply'
Date: Fri, 16 Oct 2020 15:12:19 -0700 [thread overview]
Message-ID: <xmqq7drpakho.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqk0vpalcy.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Fri, 16 Oct 2020 14:53:33 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> So, I am moderately against everything under 'use git apply' line of
> the patch. However, I do think it is a good idea to add a note
> somewhere in the manual of "am" to say something along the lines of
> the following (placed around here, or even immediately before we
> give the sample patch we used in the above example):
>
> While an output of "diff format-patch" (see above/below for an
> example) is meant to be made into a commit with "git am",
> what you have may only be an output of "git diff" without log
> message and is not meant to be directly made into a commit. In
> such a case, you may want to refer to git-apply[1] to learn how
> to apply such a change to your working tree (and optionally to
> the index).
>
> It would be a good idea to redirect those readers who are looking at
> "git am" when (perhaps realizing) they should rather be looking at
Again, s/realizing/without &/; Sorry for the noise.
> "git apply" earlier rather than later, so perhaps taking "see below"
> side and giving it as a side-note before the example starts might be
> better.
Thanks.
next prev parent reply other threads:[~2020-10-16 22:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 20:52 [PATCH 0/2] some small clarifying docfixes Emily Shaffer
2020-10-16 20:52 ` [PATCH 1/2] MyFirstContribution: clarify asciidoc dependency Emily Shaffer
2020-10-16 21:21 ` Junio C Hamano
2020-10-16 21:52 ` Taylor Blau
2020-10-16 22:48 ` Junio C Hamano
2020-10-22 23:14 ` Emily Shaffer
2020-10-16 20:52 ` [PATCH 2/2] docs: demonstrate difference between 'am' and 'apply' Emily Shaffer
2020-10-16 21:13 ` Jeff King
2020-10-16 22:04 ` Junio C Hamano
2020-10-16 21:53 ` Junio C Hamano
2020-10-16 21:59 ` Junio C Hamano
2020-10-16 22:12 ` Junio C Hamano [this message]
2020-10-22 23:13 ` Emily Shaffer
2020-10-23 3:57 ` Junio C Hamano
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=xmqq7drpakho.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/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.