I've just pushed (git://git.kernel.org/pub/scm/qgit/qgit4.git) a patch series that add "renames following" to file annotation in qgit preserving the non-linear (graph) history.
The most interesting cases in git tree are:
builtin-fsck.c (multiple renames)
builtin-mailinfo.c (multiple renames and changed directory)
git-clone.sh (nice history graph)
but the coolest is by far builtin-tar-tree.c where the file has been renamed from tar- tree.c to builtin-tar-tree.c in _two_ different commits on _two_ different branches then merged togheter in commit 1af0d11283...
To handle the latest one, a cool generalization has been necessary.
I have tested with _all_ the git files, and it seems to work in all the cases.
Have fun Marco