git-svn: dcommit/rebase confused by patches with git-svn-id: lines