All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Oct 2019, #04; Tue, 15)
Date: Wed, 16 Oct 2019 10:25:16 +0900	[thread overview]
Message-ID: <xmqq8splbhxf.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BHnSG+PtnU=jKHW2_hfLtBK1Sib_W+nqY08gGj8yHGCgw@mail.gmail.com> (Elijah Newren's message of "Tue, 15 Oct 2019 08:17:06 -0700")

Elijah Newren <newren@gmail.com> writes:

>> * en/merge-recursive-directory-rename-fixes (2019-10-12) 2 commits
>>   (merged to 'next' on 2019-10-15 at ebfdc3ff7b)
>>  + merge-recursive: fix merging a subdirectory into the root directory
>>  + merge-recursive: clean up get_renamed_dir_portion()
>>
>>  A few glitches in the heuristic in merge-recursive to infer file
>>  movements based on movements of other files in the same directory
>>  have been corrected.
>>
>>  Will merge to 'master'.
>
> I'm surprised this one was merged straight down to next; perhaps I
> should have highlighted my plans a bit clearer in the thread?

My mistake.  I am willing to revert the merge to give the topic a
clean slate.  Just tell me so.

Thanks.

> Also, a very minor point but "glitches" may be misleading; it suggests
> (to me at least) a malfunction rather than a failure to trigger,...

I used the word to mean a failure to trigger (after all, a heuristic
that fails to trigger when most people would naturelly expect it to
is showing a glitch in that case).  A better phrasing, please?

  parent reply	other threads:[~2019-10-16  1:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-15  5:33 What's cooking in git.git (Oct 2019, #04; Tue, 15) Junio C Hamano
2019-10-15 15:17 ` Elijah Newren
2019-10-15 17:39   ` Johannes Schindelin
2019-10-15 18:22     ` Elijah Newren
2019-10-16  1:25   ` Junio C Hamano [this message]
2019-10-16  6:57     ` Elijah Newren

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=xmqq8splbhxf.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.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
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.