From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jan 2013 04:15:15 +0000 (-0800)
Subject: Merge branch 'ph/rebase-preserve-all-merges'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51c6de2bab06562d0e69dcfd48f04a3b28a878b1;p=git.git

Merge branch 'ph/rebase-preserve-all-merges'

An earlier change to add --keep-empty option broke "git rebase
--preserve-merges" and lost merge commits that end up being the
same as its parent.

* ph/rebase-preserve-all-merges:
  rebase --preserve-merges: keep all merge commits including empty ones
---

51c6de2bab06562d0e69dcfd48f04a3b28a878b1