Enable git fast forward pull

1) Enables fast forward pull by default.
2) Fixes a bug in non-fast-forward pull.


@devoncarew PTAL thanks.
Does this code result in an analysis warning about dead code? If so, you may want to wrap this in an `if (true)`.