From e515e5d22effa36345695d7df6e88fe920c09776 Mon Sep 17 00:00:00 2001 From: Chloe Pelling Date: Tue, 5 Apr 2022 16:37:53 +0000 Subject: [PATCH] Make the "mark branch dormant" instructions simpler to copy+paste. I regularly run into this error for local branches corresponding to merged CLs. Before, I had to manually type `git rebase --abort` before copy-pasting the `git config branch.[...].dormant true` line into my terminal. With this change, I can just copy-paste once to execute both steps, then press up+up+enter to retry. As a side benefit, Git newcomers won't have to look up how to abort a rebase. Anyone preferring the previous workflow can still elect to copy just the `git config` line. Bug: none Change-Id: I516d4ed12c5111936cc65460ce119a43e5f86a8b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3570882 Auto-Submit: Chloe Pelling Reviewed-by: Josip Sokcevic Commit-Queue: Josip Sokcevic --- git_rebase_update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/git_rebase_update.py b/git_rebase_update.py index 5c8847440..f3080fe19 100755 --- a/git_rebase_update.py +++ b/git_rebase_update.py @@ -205,6 +205,7 @@ def rebase_branch(branch, parent, start_hash): Your working copy is in mid-rebase. Either: * completely resolve like a normal git-rebase; OR * abort the rebase and mark this branch as dormant: + git rebase --abort && \\ git config branch.%s.dormant true And then run `git rebase-update` again to resume.