PlexSheep
/
neovim-confs
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

utils/update_nvchad: Use --rebase instead of --ff-only

This commit is contained in:
Akianonymus 2021-08-20 00:57:50 +05:30 committed by siduck76
parent 5fab35f2e1
commit 3ccd804da9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/utils.lua
View File

@ -487,12 +487,12 @@ M.update_nvchad = function()
end end
-- git commands that will executed, reset in case config was modfied -- git commands that will executed, reset in case config was modfied
-- use --ff-only to not mess up if the local repo is outdated -- use --rebase, to not mess up if the local repo is outdated
local update_script = table.concat({ local update_script = table.concat({
"git reset --hard && git pull --set-upstream", "git reset --hard && git pull --set-upstream",
update_url, update_url,
update_branch, update_branch,
"--ff-only", "--rebase",
}, " ") }, " ")
-- open a new buffer -- open a new buffer