| commit | da2987d4c3be50bb9d888d145ba42fe26c7045f3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2013 19:18:31 +0000 (29 11:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2013 19:18:31 +0000 (29 11:18 -0800) | ||
| tree | f1385e81d0123482445f5f59ae498b703f253215 | treesnapshot (tar.gz zip) |
| parent | 33b29fd12c04fb599ff3d2a3235bb187710a9080 | commitdiff |
| parent | 986977847e6fb46448fc9c567292ccd2a93d40b3 | commitdiff |
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
"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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |