Shawn O. Pearce a54c527ae9 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>

2008-10-30 11:03:00 -07:00

codereview

Change RPC client to only use Google Accounts for authentication

2008-10-22 13:10:29 -07:00

froofle

Initial Contribution

2008-10-21 07:00:00 -07:00

subcmds

Remove import_tar, import_zip and the <snapshot> elements

2008-10-30 09:21:43 -07:00

.gitignore

Initial Contribution

2008-10-21 07:00:00 -07:00

color.py

Initial Contribution

2008-10-21 07:00:00 -07:00

command.py

Initial Contribution

2008-10-21 07:00:00 -07:00

COPYING

Initial Contribution

2008-10-21 07:00:00 -07:00

editor.py

Initial Contribution

2008-10-21 07:00:00 -07:00

error.py

Initial Contribution

2008-10-21 07:00:00 -07:00

gerrit_upload.py

Remove unused import from gerrit_upload.py

2008-10-28 08:44:18 -07:00

git_command.py

Initial Contribution

2008-10-21 07:00:00 -07:00

git_config.py

Cache the per-user configuration to avoid duplicate instances

2008-10-29 15:24:34 -07:00

main.py

Move the Editor configuration out of Manifest's constructor

2008-10-29 15:24:34 -07:00

Makefile

Initial Contribution

2008-10-21 07:00:00 -07:00

manifest.py

Remove import_tar, import_zip and the <snapshot> elements

2008-10-30 09:21:43 -07:00

pager.py

Initial Contribution

2008-10-21 07:00:00 -07:00

project.py

Fast-forward a fully merged topic branch during 'repo sync'

2008-10-30 11:03:00 -07:00

remote.py

Initial Contribution

2008-10-21 07:00:00 -07:00

repo

wrapper 1.6

2008-10-28 08:46:15 -07:00

S

Description

No description provided

Apache-2.0

35 MiB

0 Stars 1 Watchers 0 Forks

Languages

Python 98.3%

Shell 1.7%