make optional override of command and origin
Add merge test and test on result with option

The option '-m' tries to merge with the known head of the origin_branch
and runs the test on the result.
Add usage information when -h or option error

Git integration is now self documenting.