Questions tagged [version-control-systems]

Version control systems (VCS) keep track of file or project history. Many of these systems can us the vi family of editors for tasks (such as editing commit messages), and many Vim plugins provide interaction with VCSs from within Vim itself.

Filter by
Sorted by
Tagged with
5
votes
1answer
253 views

IDE-like inline diff highlighting in Vim

I enjoy using Vim and like it better than IDEs on most points. One common IDE feature that I miss, though, is inline diff highlighting: In this example changed lines are highlighted in blue and ...
3
votes
1answer
434 views

Is there a way to hook ctag changes to git branch checkouts and pulls?

When I checkout different branches, I sometimes notice that files in the repo are not available to Vim plugins that search based on the ctags index. I don't have a definitive test that's shown the ...
14
votes
1answer
2k views

vimdiff and merge conflicts

When merging branches under source control there is often the issue of a merge conflict with other developers. I know that we can use vimdiff to diff code changes against source control, but is there ...
4
votes
1answer
330 views

Why does Vim force programming indentation when in “gitcommit” filetype?

I found that when I am using Vim to compose git commit messages (which I have been doing for a very long time now) that there are occasionally some quirks. For example today I wrote a commit message ...