bisect / history preserving on rename + update

Hi,

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

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

I have no real good idea how to solve this. After staring at the git source for a while, I think that 1) is quite hard to solve. A sane solution for 2) might be to add a flag to the second commit, which bundles the two commits for bisection.

Any other solutions ?

	tglx