Enable git fast forward pull

1) Enables fast forward pull by default.
2) Fixes a bug in non-fast-forward pull.


@devoncarew PTAL thanks.
Let's also track this in an issue.