diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-29 23:18:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-29 23:18:31 +0400 |
| commit | da2987d4c3be50bb9d888d145ba42fe26c7045f3 (patch) | |
| tree | f1385e81d0123482445f5f59ae498b703f253215 /attr.c | |
| parent | 33b29fd12c04fb599ff3d2a3235bb187710a9080 (diff) | |
| parent | 986977847e6fb46448fc9c567292ccd2a93d40b3 (diff) | |
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
Diffstat (limited to 'attr.c')
0 files changed, 0 insertions, 0 deletions