Fix rebase -r
of a parent of a merge commit
#538
Merged
rebase -r
of a parent of a merge commit
#538