From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] docs: demonstrate difference between 'am' and 'apply'
Date: Fri, 16 Oct 2020 15:04:38 -0700 [thread overview]
Message-ID: <xmqqblh1akuh.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201016211327.GC3356073@coredump.intra.peff.net> (Jeff King's message of "Fri, 16 Oct 2020 17:13:27 -0400")
Jeff King <peff@peff.net> writes:
> I think it is OK as-is, but it might be easier to follow visually with
> text like:
>
> Here's a sample patch that we'll use below.
>
> -----
> $ cat the-patch, etc
> -----
>
>
> We can apply it with `git am`, which will create a new commit:
>
> -----
> $ git am ...etc...
> -----
>
> Especially in the HTML version, which puts the code blocks into a box
> with a different backgrounds, that makes it easy to visually jump to
> each box without having to carefully read the contents.
I agree that presentation-wise the above style is much nicer to
follow.
next prev parent reply other threads:[~2020-10-16 22:04 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 [this message]
2020-10-16 21:53 ` Junio C Hamano
2020-10-16 21:59 ` Junio C Hamano
2020-10-16 22:12 ` Junio C Hamano
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
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=xmqqblh1akuh.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--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).