Google Git
Sign in
gerrit / git-repo / c44ad093092f71320c6311cc1fc3de9171f6bd0c
commitc44ad093092f71320c6311cc1fc3de9171f6bd0c[log] [tgz]
authorJeroen Dhollander <jeroendh@google.com>Tue Aug 20 10:28:41 2024 +0200
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>Fri Aug 30 09:08:29 2024 +0000
tree1446f0329da76eeb0c295582180552129a9cd39f
parent4592a63de5e1a9312ce8a37953e233bd49a0ad80 [diff]
Add a `--rebase` option to sync command

Previously repo would abort a sync if there were published changes not
merged upstream. The --rebase option allows the modification of
published commits.

This is a copy of http://go/grev/369694 with the merge conflicts
resolved.

Bug: 40014610
Change-Id: Idac8199400346327b530abea33f1ed794e5bb4c2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/435838
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Jeroen Dhollander <jeroendh@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
2 files changed
tree: 1446f0329da76eeb0c295582180552129a9cd39f
  1. .github/
  2. docs/
  3. hooks/
  4. man/
  5. release/
  6. subcmds/
  7. tests/
  8. .flake8
  9. .gitattributes
  10. .gitignore
  11. .gitreview
  12. .isort.cfg
  13. .mailmap
  14. .project
  15. .pydevproject
  16. color.py
  17. command.py
  18. completion.bash
  19. editor.py
  20. error.py
  21. event_log.py
  22. fetch.py
  23. git_command.py
  24. git_config.py
  25. git_refs.py
  26. git_ssh
  27. git_superproject.py
  28. git_trace2_event_log.py
  29. git_trace2_event_log_base.py
  30. hooks.py
  31. LICENSE
  32. main.py
  33. MANIFEST.in
  34. manifest_xml.py
  35. pager.py
  36. platform_utils.py
  37. platform_utils_win32.py
  38. progress.py
  39. project.py
  40. pyproject.toml
  41. README.md
  42. repo
  43. repo_logging.py
  44. repo_trace.py
  45. requirements.json
  46. run_tests
  47. run_tests.vpython3
  48. setup.py
  49. ssh.py
  50. SUBMITTING_PATCHES.md
  51. tox.ini
  52. wrapper.py
README.md

repo

Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. The repo command is an executable Python script that you can put anywhere in your path.

Contact

Please use the repo-discuss mailing list or issue tracker for questions.

You can file a new bug report under the “repo” component.

Please do not e-mail individual developers for support. They do not have the bandwidth for it, and often times questions have already been asked on repo-discuss or bugs posted to the issue tracker. So please search those sites first.

Install

Many distros include repo, so you might be able to install from there.

# Debian/Ubuntu.
$ sudo apt-get install repo

# Gentoo.
$ sudo emerge dev-vcs/repo

You can install it manually as well as it's a single script.

$ mkdir -p ~/.bin
$ PATH="${HOME}/.bin:${PATH}"
$ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
$ chmod a+rx ~/.bin/repo