emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cli): recommend "checkout main" option if prompted

Browse source 
In case straight prompts something like the following:

    > In repository "git-modes", HEAD on "master" is behind default branch "main"

         1) Abort
         2) Checkout "main" (Choose this if unsure)
         3) Magit log "master..main" and open recursive edit
This commit is contained in:
Henrik Lissner 2023-02-18 16:48:36 -05:00
parent 79736d832d
commit c6b3a81da0
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cli/packages.el
View file

@ -690,7 +690,7 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
("^In repository \"[^\"]+\", [^ ]+ (on branch \"[^\"]+\") is ahead of default branch \"[^\"]+\"" ("^In repository \"[^\"]+\", [^ ]+ (on branch \"[^\"]+\") is ahead of default branch \"[^\"]+\""
. "^Checkout branch \"") . "^Checkout branch \"")
("^In repository " ("^In repository "
. "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL")) . "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL\\|^Checkout \"main\""))
"A list of regexps, mapped to regexps. "A list of regexps, mapped to regexps.
Their CAR is tested against the prompt, and CDR is tested against the presented Their CAR is tested against the prompt, and CDR is tested against the presented