I also saw you added a comment saying "FIXME: Add support for Git's "rename from/to"?". I am curious: What do you have in mind? What kind of output of "git diff" do you want to support? Do you want to link the related "New file" and "Deleted file" hunks? -- Matthias