Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 18:08:09 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 18:08:09 +0000 (11:08 -0700)
commit56173d28a5fb811c9525a8d5052ab6d83a07122e
treed3a0dba51a0e6760184c4ffd7e4f2f9bdf23b8f8
parent0f57f731ea2a540a4c82b476054e8a36aebb2314
parent3d946165e1177905103a25aeb374e018c510e540
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
sequencer.c