Rebase the patches and maintain through git