diff options
| author | Shawn O. Pearce <sop@google.com> | 2010-03-06 19:29:56 -0800 | 
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2010-03-06 19:29:56 -0800 | 
| commit | 69b1e8aa65ab933fa919166d88aec90c86852beb (patch) | |
| tree | 0a8635a835abfd8c05a04bd03639ab2d07e70d5f /manifest_submodule.py | |
| parent | 840ed0fab7cb4c2ab296c7d7d45f13e2523bae1c (diff) | |
| parent | 9452e4ec0941fbee163e35ebdcd6ca6ee7df55cb (diff) | |
| download | git-repo-69b1e8aa65ab933fa919166d88aec90c86852beb.tar.gz | |
Merge branch 'stable'
* stable:
  Automatically install Gerrit Code Review's commit-msg hook
  Fail sync when encountering "N commits behind."
  Check that we are not overwriting a local repository when syncing.
  Honor url.insteadOf when setting up SSH control master connection
  sync: Fix split call on malformed email addresses
  Fixing project renaming bug.
Conflicts:
	hooks/commit-msg
	project.py
	subcmds/sync.py
Change-Id: I5eaf8fef8cbe4a95d124368112293a9ca64325bf
Diffstat (limited to 'manifest_submodule.py')
0 files changed, 0 insertions, 0 deletions
