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

docs(cli): doom upgrade: s/-f/--force

Browse source 
Fix: #6712
This commit is contained in:
Ken Bolton 2022-09-30 16:59:37 -04:00 • committed by GitHub
parent c82e7455bb
commit e9a1908e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cli/upgrade.el
View file

@ -90,7 +90,7 @@ following shell commands:
(user-error "%s\n\n%s\n\n %s" (user-error "%s\n\n%s\n\n %s"
(format "Refusing to upgrade because %S has been modified." (format "Refusing to upgrade because %S has been modified."
(abbreviate-file-name doom-emacs-dir)) (abbreviate-file-name doom-emacs-dir))
"Either stash/undo your changes or run 'doom upgrade -f' to discard local changes." "Either stash/undo your changes or run 'doom upgrade --force' to discard local changes."
(string-join dirty "\n")) (string-join dirty "\n"))
(print! (item "You have local modifications in Doom's source. Discarding them...")) (print! (item "You have local modifications in Doom's source. Discarding them..."))
(sh! "git" "reset" "--hard" (format "origin/%s" branch)) (sh! "git" "reset" "--hard" (format "origin/%s" branch))