From: Derrick Stolee <derrickstolee@github.com>
To: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, me@ttaylorr.com, Johannes.Schindelin@gmx.de,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v2] git-rebase.txt: use back-ticks consistently
Date: Wed, 29 Jun 2022 08:43:31 -0400 [thread overview]
Message-ID: <45869a54-5106-0223-b116-c3f390780ccf@github.com> (raw)
In-Reply-To: <xmqqwnd0h30t.fsf@gitster.g>
On 6/28/22 5:49 PM, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> -apply backend: When applying a patch, ignore changes in whitespace in
>> -context lines. Unfortunately, this means that if the "old" lines being
>> -replaced by the patch differ only in whitespace from the existing
>> -file, you will get a merge conflict instead of a successful patch
>> -application.
>> +apply backend:;;
>
> Hmph, I am surprised that you took this, with an extra colon. Does
> it format nicely?
Well, this is somewhat of an "oops" because I honestly thought you
had kept the colons in your comment, but it turns out that I misread
it.
I had replied with this doc-diff:
- apply backend: When applying a patch, ignore changes in whitespace
- in context lines. Unfortunately, this means that if the "old" lines
- being replaced by the patch differ only in whitespace from the
- existing file, you will get a merge conflict instead of a
- successful patch application.
+ apply backend:
+ When applying a patch, ignore changes in whitespace in context
+ lines. Unfortunately, this means that if the "old" lines being
+ replaced by the patch differ only in whitespace from the
+ existing file, you will get a merge conflict instead of a
+ successful patch application.
- merge backend: Treat lines with only whitespace changes as
- unchanged when merging. Unfortunately, this means that any patch
- hunks that were intended to modify whitespace and nothing else will
- be dropped, even if the other side had no changes that conflicted.
+ merge backend:
+ Treat lines with only whitespace changes as unchanged when
+ merging. Unfortunately, this means that any patch hunks that
+ were intended to modify whitespace and nothing else will be
+ dropped, even if the other side had no changes that conflicted.
So, we do have a render that doesn't look awful, but since we already
have formatting that makes it clear these are subsections, the colons
are not needed.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-06-29 12:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-27 21:21 [PATCH] git-rebase.txt: use back-ticks consistently Derrick Stolee via GitGitGadget
2022-06-28 9:59 ` Phillip Wood
2022-06-28 19:29 ` Derrick Stolee
2022-06-28 10:22 ` Ævar Arnfjörð Bjarmason
2022-06-28 13:20 ` Rendering back-ticks in plaintext docs (was Re: [PATCH] git-rebase.txt: use back-ticks consistently) Derrick Stolee
2022-06-28 16:59 ` Junio C Hamano
2022-06-28 16:54 ` [PATCH] git-rebase.txt: use back-ticks consistently Junio C Hamano
2022-06-28 19:40 ` Derrick Stolee
2022-06-28 20:02 ` [PATCH v2] " Derrick Stolee via GitGitGadget
2022-06-28 21:49 ` Junio C Hamano
2022-06-29 9:31 ` Phillip Wood
2022-06-29 12:40 ` Derrick Stolee
2022-06-30 17:18 ` Junio C Hamano
2022-06-29 12:43 ` Derrick Stolee [this message]
2022-06-29 9:27 ` Phillip Wood
2022-06-29 12:41 ` Derrick Stolee
2022-06-29 13:21 ` [PATCH v3] " Derrick Stolee via GitGitGadget
2022-06-29 15:21 ` Phillip Wood
2022-06-30 17:25 ` 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=45869a54-5106-0223-b116-c3f390780ccf@github.com \
--to=derrickstolee@github.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@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 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.