Fixed --set-upstream and its shorthand version command from task 2.
Merge remote-tracking branch 'upstream/master'
Merge pull request #155 from tuunanen/master

Fixed --set-upstream and its shorthand version command.