diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-09-30 18:36:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 18:36:19 -0400 |
| commit | e2647366c95ef307963a1d7bcf1ac0da20c06858 (patch) | |
| tree | ccc2d645fb12dacbdabe32c5bd78520483f15b63 | |
| parent | 3bdc34d0657d223599afdf0ce9b072fafa3d5648 (diff) | |
| parent | c2f337ce97e130d9b1db8c3422dc0319fa857b9b (diff) | |
| download | rneovim-e2647366c95ef307963a1d7bcf1ac0da20c06858.tar.gz rneovim-e2647366c95ef307963a1d7bcf1ac0da20c06858.tar.bz2 rneovim-e2647366c95ef307963a1d7bcf1ac0da20c06858.zip | |
Merge pull request #9073 from blueyed/vim-patch-ff
vim-patch.sh: use --ff with git-pull
| -rwxr-xr-x | scripts/vim-patch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index bba76ffa97..2d7cbf4552 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -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 |