Junio C Hamano 1692579dd3 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

2012-04-30 14:58:01 -07:00

23 KiB

Raw Blame History

View Raw