| commit | 9a6aa084681c9fa9df24ac598d2a13d61a7bf8b3 | [log] [tgz] |
|---|---|---|
| author | Victor Vianna <victorvianna@google.com> | Tue Nov 29 00:59:52 2022 +0000 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Nov 29 00:59:52 2022 +0000 |
| tree | ad329c56fe8523ee3476ef7dbf358082527e13ed | |
| parent | 84edf22d0e5bf3f9ae60714ed9789fd62f86cf2a [diff] [blame] |
Suggest --no-fetch flag after git rebase-update conflict This spares an unnecessary git fetch. Change-Id: I552148bdfadc3482bda0d71d75aaf9d9ed61d75d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4062088 Auto-Submit: Victor Vianna <victorvianna@google.com> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
diff --git a/git_rebase_update.py b/git_rebase_update.py index f3080fe..c4dbd2f 100755 --- a/git_rebase_update.py +++ b/git_rebase_update.py
@@ -208,7 +208,7 @@ git rebase --abort && \\ git config branch.%s.dormant true - And then run `git rebase-update` again to resume. + And then run `git rebase-update -n` to resume. """ % branch)) return False else: