git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Johannes Sixt <j6t@kdbg.org>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] git-rebase.txt: update note about directory rename detection and am
Date: Sun, 09 Dec 2018 09:22:29 +0900
Message-ID: <xmqq8t0z7dmi.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGSmyAb_d52TLS=7oQyMYxt=EYjNdDofY4nzLd9CYvwuQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt <j6t@kdbg.org> wrote:
>>
>> From: Elijah Newren <newren@gmail.com>
>>
>> In commit 6aba117d5cf7 ("am: avoid directory rename detection when
>> calling recursive merge machinery", 2018-08-29), the git-rebase manpage
>> probably should have also been updated to note the stronger
>> incompatibility between git-am and directory rename detection.  Update
>> it now.
>>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>> ---
>>   Documentation/git-rebase.txt | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
>> index 41631df6e4..7bea21e8e3 100644
>> --- a/Documentation/git-rebase.txt
>> +++ b/Documentation/git-rebase.txt
>> @@ -569,8 +569,9 @@ it to keep commits that started empty.
>>   Directory rename detection
>>   ~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> -The merge and interactive backends work fine with
>> -directory rename detection.  The am backend sometimes does not.
>> +Directory rename heuristics are enabled in the merge and interactive
>> +backends.  Due to the lack of accurate tree information, directory
>> +rename detection is disabled in the am backend.
>>
>>   include::merge-strategies.txt[]
>
> I was intending to send this out the past couple days, was just kinda
> busy.  Thanks for handling it for me.

Thanks, both.  I can live with format=flowed, but would appreciate
if we can avoid it next time.

      reply index

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
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 [this message]

Reply instructions:

You may reply publically 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=xmqq8t0z7dmi.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=newren@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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox