diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-21 20:15:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-21 20:15:15 -0800 |
commit | 51c6de2bab06562d0e69dcfd48f04a3b28a878b1 (patch) | |
tree | 71df21800244a482a0ad6246e85d98fb90e4f7ba /t/t3401-rebase-partial.sh | |
parent | 68434e287988f697a6565cb4666598bd8033f46f (diff) | |
parent | 986977847e6fb46448fc9c567292ccd2a93d40b3 (diff) | |
download | git-51c6de2bab06562d0e69dcfd48f04a3b28a878b1.tar.gz |
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
Diffstat (limited to 't/t3401-rebase-partial.sh')
0 files changed, 0 insertions, 0 deletions