From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jan 2013 19:18:31 +0000 (-0800)
Subject: Merge branch 'ph/rebase-preserve-all-merges' into maint
X-Git-Tag: v1.8.1.3~20
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/da2987d4c3be50bb9d888d145ba42fe26c7045f3

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

"git rebase --preserve-merges" lost empty merges in recent versions
of Git.

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

da2987d4c3be50bb9d888d145ba42fe26c7045f3