I really like magit for some stuff, I haven't had the chance to look at the video but I am hoping they are showing the ediff between branches feature or easily stacking only the change you need to commit.