From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Mar 2015 21:58:38 +0000 (-0700)
Subject: Sync with 2.3.5
X-Git-Tag: v2.4.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cf8a8c6bd53c43e29cb735eb7934ffc996475d77

Sync with 2.3.5

* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
---

cf8a8c6bd53c43e29cb735eb7934ffc996475d77