On Thu, Sep 3, 2020 at 12:36 PM Victor Toni <victor.toni@xxxxxxxxx> wrote: > > is more difficult to recover from. (I'm still thankful for `.git/logs/HEAD`) another command that might not be that well known and that will always recover from a botched merge (or a rebase in this case) : $ git reset --hard ORIG_HEAD Carlo PS. `git reflog` might be also interesting; sorry if going slightly off topic
