From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Apr 2012 21:58:00 +0000 (-0700)
Subject: Merge branch 'nh/empty-rebase'
X-Git-Tag: v1.7.11-rc0~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1692579dd3569ebc01187872db91ee2ad93cc962;p=git.git

Merge branch 'nh/empty-rebase'

"git rebase" learned to optionally keep commits that do not introduce
any change in the original history.

By Neil Horman
* nh/empty-rebase:
  git-rebase: add keep_empty flag
  git-cherry-pick: Add test to validate new options
  git-cherry-pick: Add keep-redundant-commits option
  git-cherry-pick: add allow-empty option
---

1692579dd3569ebc01187872db91ee2ad93cc962