repo 1.6.7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBJ7egHFlMNXpIPXGURAu6WAJ0R3fm18d53wEGBGZ93V/ZvwOzPkwCfcGrx
pQRQNdyz9Gtvr3xQrnohFUs=
=ArFY
-----END PGP SIGNATURE-----
Fix 'repo sync' rebase logic on a published branch

If the current branch is published, but all published commits are
merged into the manifest revision, but there is also at least one
unpublished commit on the current branch, we should rebase the
unpublished commit, rather than creating a merge commit.

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