git-commands adding info about branching and merging