Sync with 2.3.5

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

Junio C Hamano committed Mar 31, 2015 at 14:58 UTC cf8a8c6bd53c43e29cb735eb7934ffc996475d77

No changes.