Re: merge doesn't remove files

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: merge doesn't remove files

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:52

Gerrit Pape [off-list ref] 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.

Re: merge doesn't remove files

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:52

Junio C Hamano [off-list ref] wrote:
Gerrit Pape [off-list ref] writes:
quoted
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 [off-list ref]
  Date:   Wed Dec 13 05:42:44 2006 -0500

Its in 1.5.0-rc0, but nothing earlier.

-- 
Shawn.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help