From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Mar 2015 16:37:51 +0000 (-0700)
Subject: Merge branch 'ss/pull-rebase-preserve'
X-Git-Tag: v2.4.0-rc1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7?hp=--cc

Merge branch 'ss/pull-rebase-preserve'

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

3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7