| commit | 3a67878f20327094648d4cb65f90be6c697b2a8d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jan 2013 20:06:12 +0000 (15 12:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jan 2013 20:06:12 +0000 (15 12:06 -0800) | ||
| tree | 74cc348e0436ff1143a1177d7b60be7e3ab56dc3 | treesnapshot (tar.gz zip) |
| parent | 70a5ca7973863a33f611340b2d866984c770a0f7 | commitdiff |
| parent | 986977847e6fb46448fc9c567292ccd2a93d40b3 | commitdiff |
Merge branch 'ph/rebase-preserve-all-merges' into next
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
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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |