tree 58821237405536aa27b7aff93fc17b9fd476a15e
parent 5679fd9e6edbc306040add106ecedbb4769c2c64
author Haowei Wu <haowei@google.com> 1559358193 -0700
committer Haowei Wu <haowei@google.com> 1559358193 -0700

[patch] Use 'git rebase' with '--rebase-merges' by default.

This change adds '--rebase-merges' flag to rebase when using 'jiri
patch'. Without this flag, git will drop merge commits, causing patch
errors.

Bug: INTK-1106
Test: Local
Change-Id: I7fd5a6fa4ad1af16a4b20b395758f56dd3fe7b76