mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch.sh: use --ff with git-pull
I have `merge.ff = no` in my Git config to not use fast-forward merges by default, but when updating the Vim sources it should not cause a merge commit. [ci skip]
This commit is contained in:
parent
3bdc34d065
commit
c2f337ce97
@ -93,7 +93,7 @@ get_vim_sources() {
|
||||
exit 1
|
||||
fi
|
||||
echo "Updating Vim sources: ${VIM_SOURCE_DIR}"
|
||||
git pull &&
|
||||
git pull --ff &&
|
||||
msg_ok "Updated Vim sources." ||
|
||||
msg_err "Could not update Vim sources; ignoring error."
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user