tree 2ca943f3833963b4d34d1a675dc9f6ed2f1bd201
parent b1168ffadaff387a8b7ab9a9c861073035c505a8
author Shawn O. Pearce <sop@google.com> 1239894866 -0700
committer Shawn O. Pearce <sop@google.com> 1239895409 -0700

Use default rebase during sync instead of rebase -i

rebase interactive (aka rebase -i) has changed in newer versions
of git, and doesn't always generate the sequence of commits the
same way it used to.  It also doesn't handle having a previously
applied commit try to be applied again.

The default rebase algorithm is better suited to our needs.
It uses --ignore-if-in-upstream when generating the patch series
for git-am, and git-am with its 3-way fallback is able to handle
a rename case just as well as the cherry-pick variant used by -m.
Its also a generally faster implementation.

Signed-off-by: Shawn O. Pearce <sop@google.com>