[PATCH v2] rebase -i -p: doesn't pick certain merge commits that are children of "upstream"

This patch contains an updated commit message.  The "-p" flags, which are vital
to this issue, were completely missing from the previous message.

Andrew Wong (1):
  rebase -i -p: doesn't pick certain merge commits that are children of
    "upstream"

 git-rebase--interactive.sh               |    3 +--
 t/t3404-rebase-interactive.sh            |    2 +-
 t/t3409-rebase-preserve-merges.sh        |   28 +++++++++++++++++++++++++++-
 t/t3411-rebase-preserve-around-merges.sh |    2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

-- 
1.7.6.rc0.1.gf20d7