search

bronson / vim-update-bundles

Use Pathogen and Git to manage your Vim plugins.
91 stars 13 forks source link

Don't create bogus merges when upstream changes #2

Closed bronson closed 13 years ago

bronson commented 13 years ago

Right now, when upstream changes, we print this:

  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.

Repos are getting swapped out rather often: http://vim-scripts.org/news/2010/11/13/remove-needless-dirs.html

bronson commented 13 years ago

Fixed by 44910bb114afcdaab618b6a9f0cad8e7b10f444b