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 /test/functional/api/vim_spec.lua | |
| 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 'test/functional/api/vim_spec.lua')
0 files changed, 0 insertions, 0 deletions