From: Christian Couder <chriscool@tuxfamily.org>
To: git@vger.kernel.org
Cc: Junio Hamano <junkio@cox.net>, krh@redhat.com
Subject: Re: Possible d/f conflict bug or regression
Date: Sat, 29 Mar 2008 09:01:19 +0100 [thread overview]
Message-ID: <200803290901.19154.chriscool@tuxfamily.org> (raw)
In-Reply-To: <200803290813.08419.chriscool@tuxfamily.org>
Le samedi 29 mars 2008, Christian Couder a écrit :
>
> 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.
next prev parent reply other threads:[~2008-03-29 7:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-29 7:13 Possible d/f conflict bug or regression Christian Couder
2008-03-29 8:01 ` Christian Couder [this message]
2008-03-30 1:29 ` Bryan Donlan
2008-03-30 4:44 ` Christian Couder
2008-03-30 4:51 ` Bryan Donlan
2008-03-30 23:46 ` Junio C Hamano
2008-03-31 0:28 ` [PATCH 1/3] Add corner case tests for diff-index and diff-files Junio C Hamano
2008-03-31 0:29 ` [PATCH 2/3] diff-index: careful when inspecting work tree items Junio C Hamano
2008-03-31 3:12 ` Junio C Hamano
2008-03-31 3:47 ` Christian Couder
2008-03-31 0:30 ` [PATCH 3/3] diff-files: " 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=200803290901.19154.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=krh@redhat.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 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).