From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 22 Apr 2013 12:36:49 GMT
Subject: Re: [PATCH] t4202 (log): add failing test for log with subtree
Message-ID: <vpqip3eoi72.fsf@grenoble-inp.fr>
In-Reply-To: <CALkWK0nMgbZY7E-wPNj2C7W98Y4HtQ7Hss6uMKngajB5iJrjDw@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Matthieu Moy wrote:
>> This is somehow expected: the subtree merge changed the filename during
>> merge (it is subtree/file.txt after the merge, and just file.txt
>> before), so "git log" without --follow just considers the file appeared.
>
> No, a merge does not "change" any filenames.

Read again my message, especially the "it is subtree/file.txt after the
merge, and just file.txt before" part. Replace "subtree" with "bar" and
"file.txt" with "ichi".

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/