Git: Configuration

* use simple option as default for pushes
* enable "reuse recorded resolution"