Haha git diff <other branch> | patch -Rp1
go brrrr!
@ryanc ... does this just... .. what? what does this do? Creates a patch that removes all the differences?
@jjacobsson Patches the current branch to match the other branch, for when rebase doesn't work and you're tired of git's bullshit.
@ryanc Ah yes. Yeah I have done that. I mean not in such a neat command, but with the same results. :D