Re: Possible d/f conflict bug or regression

From: Christian Couder <chriscool@tuxfamily.org>
Date: Mar 29, 2008, 08:01 UTC
Message-ID: <200803290901.19154.chriscool@tuxfamily.org>
In-Reply-To: <200803290813.08419.chriscool@tuxfamily.org>

Le samedi 29 mars 2008, Christian Couder a écrit :

Show 10 quoted lines

>
> mkdir testdir &&
>         cd testdir &&
>         touch foo &&
>         git init &&
>         git add . &&
>         git commit -m 'Initial commit.' &&
>         rm foo &&
>         mkdir foo &&
>         git commit -a -m 'Test.'

I don't know if this helps but with "git rm foo" instead of "rm foo" it works like this:

Initialized empty Git repository in .git/
Created initial commit e784a71: Initial commit.
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 foo
rm 'foo'
Created commit 232e3ae: Test.
 0 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 foo

Christian.