This solves the problem of rebasing local commits against an
upstream that has renamed files.
Signed-off-by: NEric Wong <normalperson@yhbt.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>