From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences
Date: Wed, 5 Dec 2018 07:37:36 -0800 [thread overview]
Message-ID: <CABPp-BHzESYnQy5JwXvtXyLHgHR9u3UNVOZF2gU1m_uTMGkyfg@mail.gmail.com> (raw)
In-Reply-To: <xmqqr2ewbevt.fsf@gitster-ct.c.googlers.com>
On Tue, Dec 4, 2018 at 11:40 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Johannes Sixt <j6t@kdbg.org> writes:
>
> > Please let me deposit my objection. This paragraph is not the right
> > place to explain what directory renme detection is and how it works
> > under the hood. "works fine" in the original text is the right phrase
> > here; if there is concern that this induces expectations that cannot
> > be met, throw in the word "heuristics".
> >
> > Such as:
> > Directory rename heuristics work fine in the merge and interactive
> > backends. It does not in the am backend because...
>
> OK, good enough, I guess. Or just s/work fine/is enabled/.
So...
Directory rename heuristics are enabled in the merge and interactive
backends. They are not in the am backend because it operates on
"fake ancestors" that involve trees containing only the files modified
in the patch. Due to the lack of accurate tree information, directory
rename detection is disabled for the am backend.
?
next prev parent reply other threads:[~2018-12-05 15:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 17:34 [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences Johannes Sixt
2018-12-03 20:42 ` Martin Ågren
2018-12-03 20:50 ` Johannes Sixt
2018-12-04 2:49 ` Junio C Hamano
2018-12-03 20:56 ` Johannes Schindelin
2018-12-04 21:24 ` Elijah Newren
2018-12-04 21:53 ` Johannes Sixt
2018-12-04 23:17 ` Elijah Newren
2018-12-05 3:54 ` Junio C Hamano
2018-12-05 6:20 ` Elijah Newren
2018-12-05 6:57 ` Johannes Sixt
2018-12-05 7:40 ` Junio C Hamano
2018-12-05 15:37 ` Elijah Newren [this message]
2018-12-05 21:16 ` Johannes Sixt
2018-12-05 22:46 ` Junio C Hamano
2018-12-07 17:51 ` [PATCH] git-rebase.txt: update note about directory rename detection and am Johannes Sixt
2018-12-07 18:46 ` Elijah Newren
2018-12-09 0:22 ` 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=CABPp-BHzESYnQy5JwXvtXyLHgHR9u3UNVOZF2gU1m_uTMGkyfg@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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 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 NNTP newsgroup(s).