Just learned git reflog, WHERE HAS THIS BEEN IN MY LIFE?

I'll have to check that out

Whats that?

@inhamul google “how to undo rebase —onto” that’s how it saved my life

ok, have you used cherry-pick?

@jesustricks rebase -i?

ref log or re flog :thinking:

To be fair the last one sounds more fun

@fuckwit reflo g

how are you a developer?

lol

I did not knew it either

git reflog isn't just handy. It proves that it is really really hard to break your repo. 😉

Got me out of trouble more than once!

@ManBunMike git checkout reflog

@arcsector r eflog

@Yamakuzure I was in deep shit today and it saved my life

@devTea no, I'm talking about another command, cherry-pick, try it sometime

@devTea ok will look it that
Thanks

You should also try for bisect when you don't know what commit introduced a bug, but you know a clean commit some long time ago :)

@jesustricks cherry-pick is also really handy when you accidentally commit something in detached state. And that can happen with submodules quite often.

Other really important commands are
* rebase -i
* commit --patch
* bisect
* format-patch
* am
and last but not least the "-X" option when merging or rebasing. (Just remember that "ours" and "theirs" mean the opposite thing when rebasing.)

@Yamakuzure thanks a lot will note it down