On 2007-08-14 10:38:01 +0200, Thomas Gleixner wrote:
> is there a built in way to handle the following situation:
>
> file A is renamed to B
> file A is created again and new content is added.
>
> I found only two ways to do that, which both suck:
>
> 1)
> git-mv A B
> git-add A
> git commit
>
> results in a copy A to B and lost history of B
What exactly do you mean by "lost history of B"? You do know that git
doesn't record renames? So you could just as well do
$ mv A B
$ create a new A
$ git add A B
$ git commit
> 2)
> git-mv A B
> git commit
> git-add A
> git commit
>
> preserves the history of B, but breaks bisection because A is
> needed to compile
Yes. I wouldn't recommend this option for that reason.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
