IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9073 from blueyed/vim-patch-ff

Browse Source 
vim-patch.sh: use --ff with git-pull
This commit is contained in:
James McCoy 2018-09-30 18:36:19 -04:00 committed by GitHub
commit e2647366c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vim-patch.sh
View File

@ -93,7 +93,7 @@ get_vim_sources() {
exit 1 exit 1
fi fi
echo "Updating Vim sources: ${VIM_SOURCE_DIR}" echo "Updating Vim sources: ${VIM_SOURCE_DIR}"
git pull && git pull --ff &&
msg_ok "Updated Vim sources." || msg_ok "Updated Vim sources." ||
msg_err "Could not update Vim sources; ignoring error." msg_err "Could not update Vim sources; ignoring error."
fi fi