Merge branch 'ss/pull-rebase-preserve'

* ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull

Junio C Hamano committed Mar 28, 2015 at 09:37 UTC 3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7

No changes.