Handle --rebased comments with trailing whitespaces/comments