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: http://git.ipfire.org/?a=commitdiff_plain;h=3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7;p=thirdparty%2Fgit.git

Merge branch 'ss/pull-rebase-preserve'

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

3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7