5 ms·

> Oh shit, I accidentally committed to the wrong branch! Other ways to do it (that don't require to retype the commit message): - rebase onto the correct branc

> Oh shit, I accidentally committed to the wrong branch! Other ways to do it (that don't require to retype the commit message): - rebase onto the correct branch: git branch foo git reset --hard HEAD~ git rebase --onto name-of-the-correct-branch HEAD foo git checkout name-of-the-correct-branch git merge foo git branch -D foo - cherry-pick git reset --hard HEAD~ git checkout name-of-the-correct-branch git cherry-pick name-of-the-branch-you-mistakenly-committed-to@{1} (or git cherry-pick HEAD@{2}) > Oh shit, I tried to run a diff but nothing happened?! You probably want to know `git diff HEAD` too. Edit: formatting.

mungoman2 10y ago
Or use git branch -m to rename master to something else, then checkout master anew.
- mmun 10y ago
  Or this variant git checkout -b actual-branch git branch -f master origin/master
- OskarS 10y ago
  That's clever, I'll remember that. But don't you lose all tracking information if you do that?
  - phaemon 10y ago
    What tracking information are you referring to?
ToJans76 10y ago
for the first one, you don't need rebase afaik: git branch name-of-the-correct-branch git reset --hard HEAD~ git checkout name-of-the-correct-branch