Git merging, branch names, making and tracking branches. Added completion that doesn't work.