Right after dealing with master you can easily back to your previous branch with:
$ git checkout master $ git checkout -