diff options
| author | Shawn O. Pearce <sop@google.com> | 2008-10-30 11:03:00 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2008-10-30 11:03:00 -0700 |
| commit | a54c527ae941a3bbf8b3ec54249ab12c3d6bf78b (patch) | |
| tree | ed70807cabe8bd010277cd0a1d976a3d726f5f70 /main.py | |
| parent | df830f12389984adeeba04659615b9fc230f2db3 (diff) | |
| download | git-repo-a54c527ae941a3bbf8b3ec54249ab12c3d6bf78b.tar.gz | |
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>
Diffstat (limited to 'main.py')
0 files changed, 0 insertions, 0 deletions