diff options
| author | Jeroen Dhollander <jeroendh@google.com> | 2024-08-20 10:28:41 +0200 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-08-30 09:08:29 +0000 |
| commit | c44ad093092f71320c6311cc1fc3de9171f6bd0c (patch) | |
| tree | 1446f0329da76eeb0c295582180552129a9cd39f /tests/test_editor.py | |
| parent | 4592a63de5e1a9312ce8a37953e233bd49a0ad80 (diff) | |
| download | git-repo-c44ad093092f71320c6311cc1fc3de9171f6bd0c.tar.gz | |
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>
Diffstat (limited to 'tests/test_editor.py')
0 files changed, 0 insertions, 0 deletions