tree 749c3eec1e754e46584fa4b9e164b92554e1cecd
parent ca4effd8bce5e0dfce7ce1425074475c8643b7f0
author Vincent van Ravesteijn <vfr@lyx.org> 1337867846 +0000
committer Junio C Hamano <gitster@pobox.com> 1339966902 -0700

Do not autosquash in case of an implied interactive rebase

The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>