Git

When rebasing commits, it’s common that the author date gets reset (since you’re re-authoring the commit). Simon Willison’s solution …

$ git rebase --onto master server client Take the client branch, figure out the patches since it diverged from the server branch, and replay these …