From 3ccd804da94e57a807a84bb62b968a75add62a0a Mon Sep 17 00:00:00 2001 From: Akianonymus Date: Fri, 20 Aug 2021 00:57:50 +0530 Subject: [PATCH] utils/update_nvchad: Use --rebase instead of --ff-only --- lua/utils.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/utils.lua b/lua/utils.lua index 73b70d4..387ee17 100644 --- a/lua/utils.lua +++ b/lua/utils.lua @@ -487,12 +487,12 @@ M.update_nvchad = function() end -- 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({ "git reset --hard && git pull --set-upstream", update_url, update_branch, - "--ff-only", + "--rebase", }, " ") -- open a new buffer