Jeroen Dhollander c44ad09309 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>		2024-08-30 09:08:29 +00:00
..
__init__.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
abandon.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
branches.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
checkout.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
cherry_pick.py	Update logger.warn to logger.warning	2023-10-13 19:34:26 +00:00
diff.py	isort: format codebase	2023-08-22 18:32:22 +00:00
diffmanifests.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
download.py	subcmds: Use repo logger	2023-09-14 17:13:37 +00:00
forall.py	subcmds: Use repo logger	2023-09-14 17:13:37 +00:00
grep.py	subcmds: Use repo logger	2023-09-14 17:13:37 +00:00
help.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
info.py	info: Handle undefined mergeBranch	2023-11-20 19:22:53 +00:00
init.py	git_command: unify soft/hard versions with requirements.json	2024-03-21 21:20:50 +00:00
list.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
manifest.py	Update logger.warn to logger.warning	2023-10-13 19:34:26 +00:00
overview.py	Format codebase with black and check formatting in CQ	2023-03-22 17:46:28 +00:00
prune.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
rebase.py	Update logger.warn to logger.warning	2023-10-13 19:34:26 +00:00
selfupdate.py	subcmds: Use repo logger	2023-09-14 17:13:37 +00:00
smartsync.py	Format codebase with black and check formatting in CQ	2023-03-22 17:46:28 +00:00
stage.py	subcmds: Use repo logger	2023-09-14 17:13:37 +00:00
start.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00
status.py	isort: format codebase	2023-08-22 18:32:22 +00:00
sync.py	Add a --rebase option to sync command	2024-08-30 09:08:29 +00:00
upload.py	upload: add a --topic option for setting topic explicitly	2024-07-01 17:54:19 +00:00
version.py	cleanup: Update codebase to expect Python 3.6	2023-10-31 16:03:54 +00:00