Mike Pontillo d315382572 Add 'rebase="false"' attribute to the <project/> XML. ...

This new attribute can prevent 'repo sync' from automatically rebasing.

I hit a situation in where one of the git repositories I was tracking
was actually an external repository that I wanted to pull commits
into and merge myself. (NOT rebase, since that would lose the merge
history.) In this case, I'm not using 'repo upload', I'm manually
managing the merges to and from this repository.

Everything was going great until I typed 'repo sync' and it rebased
my manually-merged tree. Hence the option to skip it.

Change-Id: I965e0dd1acb87f4a56752ebedc7e2de1c502dbf8

2012-03-12 12:24:22 -07:00

docs

sync: Allow -j to have a default in manifest

2011-09-22 18:08:27 -07:00

hooks

Automatically install Gerrit Code Review's commit-msg hook

2010-03-06 19:21:00 -08:00

subcmds

sync: Add manifest_name parameter

2012-01-26 12:32:36 -05:00

tests

Fix error parsing a non-existant configuration file

2009-07-02 16:12:57 -07:00

.gitignore

.gitignore: add an entry for repopickles

2009-06-28 15:08:56 -07:00

.project

Add PyDev project files to repo

2009-06-02 00:09:07 +02:00

.pydevproject

Add PyDev project files to repo

2009-06-02 00:09:07 +02:00

color.py

Add -p to repo forall to improve output formatting

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

command.py

Make path references OS independent

2011-01-09 17:39:19 -08:00

COPYING

Initial Contribution

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

editor.py

Fix for handling values of EDITOR which contain a space.

2010-08-06 17:05:04 -07:00

error.py

sync: Support downloading bundle to initialize repository

2011-09-28 10:07:36 -07:00

git_command.py

Stabilize repo communication with subprocesses.

2011-11-29 11:54:58 -08:00

git_config.py

upload: Support uploading to Gerrit over https://

2012-01-11 16:18:40 -08:00

git_refs.py

Improve error handling when reading loose refs

2011-11-29 14:43:04 -08:00

git_ssh

Don't allow git fetch to start ControlMaster

2010-10-29 08:15:14 -07:00

main.py

Describe the repo launch version in repo version

2011-11-29 15:02:15 -08:00

manifest_xml.py

Add 'rebase="false"' attribute to the <project/> XML.

2012-03-12 12:24:22 -07:00

pager.py

Don't start the pager if stdout is a pipe

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

progress.py

Support units in progress messages

2011-09-19 14:52:57 -07:00

project.py

Add 'rebase="false"' attribute to the <project/> XML.

2012-03-12 12:24:22 -07:00

repo

Revert "Default repo manifest settings in git config"

2011-11-30 13:41:02 -08:00

SUBMITTING_PATCHES

Update SUBMITTING_PATCHES

2012-02-28 18:54:33 -08: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 35 MiB

Languages

Python 99.1%

Shell 0.9%