| commit | a54c527ae941a3bbf8b3ec54249ab12c3d6bf78b | [log] [tgz] |
|---|---|---|
| author | Shawn O. Pearce <sop@google.com> | Thu Oct 30 11:03:00 2008 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Thu Oct 30 11:03:00 2008 -0700 |
| tree | ed70807cabe8bd010277cd0a1d976a3d726f5f70 | |
| parent | df830f12389984adeeba04659615b9fc230f2db3 [diff] |
Fast-forward a fully merged topic branch during 'repo sync' Instead of trying to rebase the changes on a topic branch that has been fully merged into the upstream branch we track, we should just fast-forward the topic branch to the new upstream revision. This way the branch doesn't try to rewrite commits that are already merged in the upstream. Signed-off-by: Shawn O. Pearce <sop@google.com>