From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Mar 2018 18:08:09 +0000 (-0700)
Subject: Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
X-Git-Tag: v2.18.0-rc0~130^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/56173d28a5fb811c9525a8d5052ab6d83a07122e

Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff

* pw/rebase-keep-empty-fixes:
rebase: respect --no-keep-empty
rebase -i --keep-empty: don't prune empty commits
rebase --root: stop assuming squash_onto is unset
Git 2.16.2
---

56173d28a5fb811c9525a8d5052ab6d83a07122e