Go to file
Shawn O. Pearce 13f3da50d4 Merge branch 'stable'
* stable: (33 commits)
  Added feature to print a <notice> from manifest at the end of a sync.
  sync: Use --force-broken to continue other projects
  upload: Remove --replace option
  sync --quiet: be more quiet
  sync: Enable use of git clone --reference
  Only delete corrupt pickle config files if they exist
  Don't allow git fetch to start ControlMaster
  Check for existing SSH ControlMaster
  Fix for handling values of EDITOR which contain a space.
  upload: Fix --replace flag
  rebase: Pass through more options
  upload: Allow review.HOST.username to override email
  upload -t: Automatically include local branch name
  Warn users before uploading if there are local changes
  sync: Try fetching a tag as a last resort before giving up
  rebase: Automatically rebase branch on upstrea
  upload: Automatically --cc folks in review.URL.autocopy
  Fix format string bugs in grep
  Do not invoke ssh with -p argument when no port has been specified.
  Allow files to be copied into new folders
  ...

Conflicts:
	git_config.py
	manifest_xml.py
	subcmds/init.py
	subcmds/sync.py
	subcmds/upload.py

Change-Id: I4756a6908277e91505c35287a122a775b68f4df5
2010-12-07 11:13:29 -08:00
docs Merge branch 'stable' 2010-12-07 11:13:29 -08:00
hooks Automatically install Gerrit Code Review's commit-msg hook 2010-03-06 19:21:00 -08:00
subcmds Merge branch 'stable' 2010-12-07 11:13:29 -08: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 2010-11-29 13:17:53 -06: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 Document any crashes from the user's text editor 2009-06-24 07:15:21 -07:00
git_command.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
git_config.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
git_refs.py Make refs/remotes/m management the manifest object's responsibility 2009-07-03 20:03:38 -07:00
git_ssh Don't allow git fetch to start ControlMaster 2010-10-29 08:15:14 -07:00
main.py Add "repo branch" as an alias for "repo branches" 2009-07-14 15:23:39 -04:00
manifest_loader.py Introduce manifest format using git submodules 2009-07-03 20:50:52 -07:00
manifest_submodule.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
manifest_xml.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
manifest.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
pager.py Don't start the pager if stdout is a pipe 2009-04-01 07:24:22 -07:00
progress.py Do not emit progress if stderr is not a tty 2010-05-27 16:48:36 -07:00
project.py Merge branch 'stable' 2010-12-07 11:13:29 -08:00
repo Merge branch 'stable' 2010-12-07 11:13:29 -08:00
SUBMITTING_PATCHES Document how to contribute to the repo project 2009-07-02 13:18:55 -07:00
trace.py Fix repo --trace to show ref and config loads 2009-04-18 09:54:51 -07:00