Improved the status check to check that the correct branch is set

* also added diff sub-command, not working correctly