nil, 7 months ago (edited 7 months ago)

@b0rk accidentally merging commits. Here's how:

git rebase -i
... Do stuff
git add .
git commit --amend
git rebase --continue
.... Oh $&#@ I merged two commits together instead of keeping them separate