Fixed issue #2833: Pull with pull.rebase=preserve does rebase on invalid upstream

Closed username-removed-360247 requested to merge engycz/tortoisegit:issue_2833 into master