From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Mar 2015 21:54:11 +0000 (-0700)
Subject: Merge branch 'ss/pull-rebase-preserve' into maint
X-Git-Tag: v2.3.5~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad00aebfe93b3fc79c5ed54569f1603b8030783a?hp=--cc

Merge branch 'ss/pull-rebase-preserve' into maint

* ss/pull-rebase-preserve:
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
docs: clarify "preserve" option wording for git-pull
---

ad00aebfe93b3fc79c5ed54569f1603b8030783a