Clean up git addition

* Verbosify git usage
* Move option in private part
* Fix getopts
Clean with git