diff options
| author | Daniel Hahler <git@thequod.de> | 2018-09-30 21:05:26 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2018-09-30 21:05:26 +0200 |
| commit | c2f337ce97e130d9b1db8c3422dc0319fa857b9b (patch) | |
| tree | ccc2d645fb12dacbdabe32c5bd78520483f15b63 /scripts/vim-patch.sh | |
| parent | 3bdc34d0657d223599afdf0ce9b072fafa3d5648 (diff) | |
| download | rneovim-c2f337ce97e130d9b1db8c3422dc0319fa857b9b.tar.gz rneovim-c2f337ce97e130d9b1db8c3422dc0319fa857b9b.tar.bz2 rneovim-c2f337ce97e130d9b1db8c3422dc0319fa857b9b.zip | |
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]
Diffstat (limited to 'scripts/vim-patch.sh')
| -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 |