awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-03 12:27:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): straight: highlight 'Reset "*" to "*"' option

Browse Source
This commit is contained in:
Henrik Lissner
2024-08-31 21:45:30 -04:00
parent affaa7ec9c
commit 069ea9e02f
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

@ -677,7 +677,7 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
(defvar doom-cli--straight-auto-options (defvar doom-cli--straight-auto-options
'(("has diverged from" '(("has diverged from"
. "^Reset [^ ]+ to branch") . "^Reset [^ ]+ to ")
("but recipe specifies a URL of" ("but recipe specifies a URL of"
. "Delete remote \"[^\"]+\", re-create it with correct URL") . "Delete remote \"[^\"]+\", re-create it with correct URL")
("has a merge conflict:" ("has a merge conflict:"