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

2009-04-21 08:28:06 -07:00

docs

Correct note about local_manifest.xml capabilities

2009-04-18 11:25:58 -07:00

hooks

Install a default pre-auto-gc hook in all repositories

2008-11-03 11:00:44 -08:00

subcmds

Document the SSH ControlMaster behavior of repo sync

2009-04-21 08:28:06 -07:00

.gitignore

Initial Contribution

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

color.py

Add -p to repo forall to improve output formatting

2009-04-18 13:49:13 -07:00

command.py

Add -p to repo forall to improve output formatting

2009-04-18 13:49:13 -07:00

COPYING

Initial Contribution

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

editor.py

Fix launching of editor under 'repo upload --replace'

2009-04-18 16:57:46 -07:00

error.py

Report better errors when a project revision is invalid

2009-03-02 12:56:08 -08:00

git_command.py

Work around 'ControlPath too long' on Mac OS X

2009-04-21 08:05:27 -07:00

git_config.py

Automatically use SSH control master support during sync

2009-04-18 16:50:47 -07:00

git_refs.py

Make usage of open safer by setting binary mode and closing fds

2009-04-18 14:48:03 -07:00

git_ssh

Automatically use SSH control master support during sync

2009-04-18 16:50:47 -07:00

main.py

Automatically use SSH control master support during sync

2009-04-18 16:50:47 -07:00

manifest.py

Add repo manifest -o to save a manifest

2009-03-05 10:32:38 -08:00

pager.py

Don't start the pager if stdout is a pipe

2009-04-01 07:24:22 -07:00

progress.py

Only display a progress meter once we spend 0.5 seconds on a task

2009-04-18 10:09:16 -07:00

project.py

Fix 'repo sync' rebase logic on a published branch

2009-04-21 08:28:06 -07:00

remote.py

Add <remote project-name="..."> attribute within projects

2008-11-06 11:23:06 -08:00

repo

Clarify options that control the repo executable version

2009-04-18 11:28:57 -07:00

trace.py

Fix repo --trace to show ref and config loads

2009-04-18 09:54:51 -07:00

Description

No description provided

Apache-2.0 36 MiB

Languages

Python 98.9%

Shell 1%

Roff 0.1%