updating a.vim from git://github.com/vim-scripts/a.vim.git
warning: no common commits
and then a merge commit gets created and history is wack from here on out. If you make a change, there's no way you can push it back upstream.
We should probably tell git --rebase --ff-only. That way local changes will be preserved, and we won't create bogus history if upstream force-pushes or swaps out the repo.
Right now, when upstream changes, we print this:
and then a merge commit gets created and history is wack from here on out. If you make a change, there's no way you can push it back upstream.
We should probably tell git --rebase --ff-only. That way local changes will be preserved, and we won't create bogus history if upstream force-pushes or swaps out the repo.
Repos are getting swapped out rather often: http://vim-scripts.org/news/2010/11/13/remove-needless-dirs.html