From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Gerrit Pape <pape@smarden.org>, git@vger.kernel.org
Subject: Re: merge doesn't remove files
Date: Sat, 3 Feb 2007 22:50:37 -0500 [thread overview]
Message-ID: <20070204035037.GB16766@spearce.org> (raw)
In-Reply-To: <7vy7nezr1f.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> wrote:
> Gerrit Pape <pape@smarden.org> writes:
>
> > Shouldn't git remove the original file after merging a commit that moved
> > the file away?
>
> I think this has been fixed quite a while ago --- does not seem
> to reproduce with the current v1.5.0-rc.
Indeed, this commit of mine was supposed to fix it:
commit 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
Author: Shawn Pearce <spearce@spearce.org>
Date: Wed Dec 13 05:42:44 2006 -0500
Its in 1.5.0-rc0, but nothing earlier.
--
Shawn.
prev parent reply other threads:[~2007-02-04 3:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 22:48 merge doesn't remove files Gerrit Pape
2007-02-04 0:48 ` Junio C Hamano
2007-02-04 1:41 ` Junio C Hamano
2007-02-04 4:59 ` Shawn O. Pearce
2007-02-04 10:40 ` Linus Torvalds
2007-02-04 3:50 ` Shawn O. Pearce [this message]
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=20070204035037.GB16766@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=pape@smarden.org \
/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).