Make rebase smarter when handling PRs with merges#183

Closed

leandro-lucarella-sociomantic wants to merge 1 commit intosociomantic-tsunami:masterfrom leandro-lucarella-sociomantic:fix-183

+44-18

Commits on Sep 27, 2016

rebase: Merge --ff-only if the PR is a merge
leandro-lucarella-sociomantic
committed