Merge branch 'tg/reset-hard-show-head-with-pretty'