Note that git itself is beginning to address this exact problem by introducing new, more intuitive commands such as "restore" and "switch".