Questions tagged [git]

Questions about the integration of the Git revision control system in Vim or about the synchronisation of Vim files via Git repositories.

Filter by
Sorted by
Tagged with
0 votes
1 answer
14 views

Automatically `git add` after conflicts are resolved in vim

Coming from Spacemacs, one of the things that I miss is that files are automatically git added after all conflicts are resolved. Wondering if there's a way to do that in vim.
1 vote
2 answers
51 views

No syntax highlighting in git commit with nvim

I have installed nvim using scoop on two Windows 11 systems. The installation works fine on my laptop (Surface Laptop 3). On my desktop, when I run git commit with nvim set as my editor, the terminal (...
  • 111
1 vote
0 answers
25 views

vim-fugitive support for diff --color-words

I use vim and git primarily for editing prose documents in LaTeX or Markdown, not for coding. For this reason, my go-to git diff command is git wdiff, where the relevant part of .gitconfig reads ...
0 votes
1 answer
40 views

git config does not set vimdiff layout properly

I'm trying to configure vimdiff as a git merge tool, so my global git config contains the following lines: [merge] tool = vimdiff conflictstyle = diff3 prompt = true [mergetool "...
  • 3
3 votes
2 answers
83 views

visualize Vim undo history

Is there for Vim what Gource is for Git, to visualize Vim undo history? I'm familiar with Gundo, which display diffs of undo history, but it's not really a visualizer like Gource for Git repos.
  • 916
0 votes
1 answer
87 views

How to use Git submodules to install a plugin?

I just switched to Nvim from Vim, and came to this community. So, hello all! I'm doing very primitive config for Nvim and I'm trying to manage my plug-ins using git submodules. First of all, I'm ...
  • 11
1 vote
0 answers
45 views

Any vim plugins to integrate git status for each file in file window explorer?

is there any vim plugins could show git status for each file in file window explorer? Please notice that I am not asking integrate git status in statusline, but in file explorer like nerdtree/defx, ...
1 vote
1 answer
79 views

How can I view a diff for a single file from a diff file with multiple files?

I have a diff file generated by git diff HEAD~2 > alldiff. Is it possible to view the diff for any one file using alldiff? For example, somecmd alldiff file1withchanges will use alldiff to show ...
  • 11
0 votes
0 answers
240 views

Review two branches

description I like the fugitive :Git to review uncommitted code. I would like to do same between branches + uncommitted code. Basically to locally review MR or PR. From fugitive there are :Gclog and :...
  • 101
0 votes
1 answer
98 views

Vim Inside Docker Container Doesn't Recognise Plugins via Vim 8's Own Plugin System

I'm trying to move my development environment into a Docker container to better manage my dependencies. Hence, I need Vim inside that container as well: git clone https://github.com/vim/vim.git &&...
3 votes
1 answer
488 views

GitLens-like issue linking in vim

In VSCode, GitLens allows you to hover over a line and get a link to the PR containing the most recent change for that line. Basically with a single click you can open up the PR which often contains ...
  • 131
3 votes
3 answers
408 views

Call plugin-defined function in .vimrc

I use tpope/vim-fugitive and airblade/vim-gitgutter and I want to selectively enable gitgutter only in git repositories. Since vim-fugitive provides FugitiveIsGitDir which returns 0 or 1, this could ...
1 vote
2 answers
181 views

How can I detect if the vim I'm running on is the Git for Windows vim? [duplicate]

I have a shared .vimrc that I use across platforms. It works fine in most circumstances, but looks terrible when I run git commit from the command line. I want to make my color scheme not load when ...
0 votes
1 answer
66 views

How to write a command that uses sends the output of an arbitrary git command to fzf?

I've been messing around a bit with fzf and I'd like to be able to run a command that does something like take the output of diff -w -M origin/main...HEAD --name-only and make the contents available ...
  • 135
2 votes
0 answers
269 views

How to fuzzy search a git repository for content that once existed?

I love fzf.vim for file content searching within vim. But how could I use that to search for content that was once in a git repository's files? This stackoverflow question has basically two ...
1 vote
1 answer
71 views

How to find files which contain given fragment?

FZF (fuzzy finder) is very convenient to find files by filename. However, I sometimes only know a function name or a part of the name. Is there a way to get FZF-like search, which would filter files ...
  • 1,205
1 vote
1 answer
86 views

How to use different rules for highlighting trailing whitespace inside a gitcommit diff

In my ~/.vimrc, I have: highlight TrailingWhitespace ctermbg=blue autocmd BufReadPost * syn match TrailingWhitespace /\s\+\%#\@<!$/ This highlights trailing spaces, except when I am still typing ...
  • 861
2 votes
1 answer
278 views

Can vimdiff for git diffs be started in tab of current process?

Let's say I have a file buffer open and a :terminal split open in 1 tab page. I'd like to create a new tab where I run vimdiff but have my git diff showing. I'm trying to get git difftool HEAD~1 to ...
  • 466
0 votes
1 answer
614 views

Vim Fugitive not loading

I have recently been trying to separate my neovim config into multiple files. After moving everything involving vim-fugitive and vim-gitgutter into a separate file, git-gutter is not loading and I ...
2 votes
1 answer
4k views

How to get Vim to show git status in the statusline?

I want to show the git status in the vim statusline, but I can't find any advice on how to do that. The output of git status -s would be fine, or alternatively a single field readout indicating ...
  • 23
0 votes
1 answer
428 views

Fugitive: jump from diff to the current version

When exploring a commit using :Gedit HEAD, when I click o or Enter into the change, it shows me a vimdiff of the two file versions of the change. From there I often need to jump to the current version ...
1 vote
1 answer
533 views

GitGutter sign not working

I have airblade/vim-gitgutter installed via Vundle. Somehow even with minimal .vimrc vim-gitgutter signs aren't working. My minimal .vimrc is given below, is there any problem there? Any help will be ...
  • 532
2 votes
1 answer
729 views

Is there a Vim plugin similar to Git History Diff?

I like the extension Git History Diff in Visual Studio Code, looks something like this: I am looking for something similar for Vim. I've looked at Fugitive and other Vim plugins, but they are awkward ...
  • 133
2 votes
1 answer
324 views

Edit in .vimrc but it's not updated in .git

So I was editing my ~/.vimrc file from the home directory and saved it, but when I went to check whether it had been updated in the vimrc file (for git) which is located at /.vim/vimrc, it did not ...
5 votes
1 answer
1k 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 ...
0 votes
2 answers
151 views

don't capture stderr for git grep as grepprg

I'm trying to use git grep as my grepprg, but I keep getting spurious files such as ~/fatal: Not a git repository (or any of the parent directories): .git. Is there a way to configure vim to correctly ...
  • 1,663
1 vote
1 answer
158 views

Why is the commit message inside parentheses wrapped so strangely?

I sometimes need to do some remarks in parentheses in my commit message's detailed part. But when the parenthesized text comes to the rightmost column and is line-broken, the next line for some reason ...
  • 465
7 votes
2 answers
1k views

How to break-up gutter fights?

There a number of types of plugins use the Vim gutter to display Git status, syntax correctness, linting and code formatting. But how can conflicts be managed when multiple plugins want to update the ...
0 votes
2 answers
495 views

Is it possible to use vim-fugitive outside of the repository (in local mounted directory)

I have a git repository: ~/home/foo/repo I mounted core to another directory: mount --bind ~/home/foo/repo ~/home/bar Now I want to edit my code with vim and use vim-fugitive. vim ~/home/bar/myCode....
  • 11
2 votes
2 answers
2k views

Review: git branch in statusline

Note: this is an educational exercise. For those wanting a ready-made solution, use vim-gitbranch. I am learning vimscript, and the code below is part of my .vimrc used to display the current git ...
  • 861
3 votes
1 answer
258 views

shared vimrc on two machines; only run command for one of them

I use git to share my vimrc across multiple machines. But now I have some commands which I only want on one machine. Namely, this line: au! redhat BufReadPost (derived from this very helpful answer! ...
0 votes
0 answers
120 views

Vim "Follows" Hard links

I have a git repository that contains my vimrc file and a couple of other utilities, called myvimrcgit. I then hard link my vimrc to ~/.vimrc, so that they point to the same inodes. Now, when I go to ...
0 votes
1 answer
199 views

Always move cursor to top of gitcommit buffer

I have the following autocmd in my vimrc. augroup line_return au! au BufReadPost * \ if line("'\"") > 0 && line("'\"") <= line("$") | \ execute 'normal! g`"zvzz' | \ ...
1 vote
1 answer
1k views

`vimdiff` nor `nvim -d` are working as an external diff tool for git

First line says output is not a terminal. The rest of the output looks like term codes aren't being processed. I use st, with $TERM = st-256color. I just tried it on termite ($TERM = xterm-termite) ...
  • 175
1 vote
0 answers
53 views

Folding for git merge candidates is (at least to me) backwards

When viewing a merge candidate created by git you will have something like . . . Some stuff not in conflict <<<<<< HEAD Some stuff ====== Something different >>>>>...
  • 161
0 votes
0 answers
2k views

Vim Airline no GitBranch name [doing echo fugitive#head() shows correct branch]

I have Fugitive vim and Airline vim installed via Vundle. I installed them as follow: Plugin 'https://github.com/tpope/vim-fugitive.git' Plugin 'vim-airline/vim-airline' Airline status works fine. ...
  • 311
2 votes
1 answer
185 views

Retrieving failed fugitive commit message

I PGP sign my commit messages, and every once in a while GPG will fail for whatever reason (invalid cache, incorrect pin, etc), and my fugitive buffer will close, loosing all my changes. It doesn't ...
2 votes
1 answer
123 views

file name completion in .gitignore

I often "unignore" files in .gitignore, like this: * !.gitignore !file.txt !dir !dir/* Can I modify the pattern for which insert mode file name completion would work? In this case, instead of ./ I'd ...
  • 275
1 vote
1 answer
668 views

diffpatch using the output of git diff directly

I guess many of you are like me, and even if they have been using ViM for years, still learn new features regularly. The last that I learned was :diffp[atch] patch/name Now, I want to combine it ...
2 votes
1 answer
151 views

How to load commits in a certain date range with fugitive?

I am able to do git log --pretty=format:"%h" --after="2018-06-7" --until="2018-06-10", in the shell, but if I try to do it in vim with fugitive like this: :Glog --after="2018-6-7" --until="2018-06-10"...
1 vote
1 answer
2k views

Visualize git commit diff similarly to mergetool

I've been thinking of ways to visualize git commits with vim. I would like to be able to: run a command from the terminal such as: vimdiff -c <commit id>. vim opens with two windows on a ...
1 vote
1 answer
259 views

Saving .swp/.un~ files to subdirectories

Is there any way to save these files to automatically created subdirs? Google gave me no answers. The reason is simple- I work on several computers which I keep synced via git, so having these files ...
2 votes
0 answers
528 views

Why does Git think Vi quit in error?

Is there anything wrong with opening up a new vim tab (for scratch work) while authoring a git commit? Update: This Seems to Be a Quirk With Vi vs. Vim On further inspection prompted by @muru's ...
  • 227
1 vote
1 answer
230 views

Vim (Spacevim); :!git push == permission denied (publickey)

I have operating system: Windows 7. Git bash works fine for me, and it uses the public key id_rsa.pub. I can run git commands fine through window's command prompt as well - and it too uses the public ...
  • 11
1 vote
1 answer
1k views

How to use pure Vim as git mergetool?

Whenever there are some git merge conflicts we would type git mergetool and git would automatically launch a merge tool for us to merge the conflicts. I have been using vimdiff for a long time as my ...
2 votes
1 answer
1k views

Why "there was a problem with vi" when saving a git commit message with :wq after accidental :Wq?

When I have typed a commit message with vim and, in haste, typed :Wq instead of :wq I get an error: E492: Not an editor command: Wq from which I can (falsly?) recover, meaning the editor seems to ...
0 votes
1 answer
446 views

How to compile vim for user only and use git to track it?

How can I compile vim for my user only so set source path to /home/user/ ? And how can I track changes with git. Basically I want to build and compile vim from source, and store it on my github repo....
  • 129
1 vote
1 answer
637 views

How to customize the color of an HTML output file generated from Git Bash?

I have used the following command in Git Bash to perform a 'vimdiff' for 2 XML files. vimdiff xml1.xml xml2.xml -c TOhtml -c 'w! result.html' -c 'qa!' The HTML file which is getting generated is ...
0 votes
1 answer
1k views

Create a specific .vimrc for git commits usage?

There is probably an easy solution for this, but here it goes : whenever I do a git commit, an error appears (copied hereunder). Vim then starts, some of my .vimrc features are enabled, some are not. ...
  • 1,667
1 vote
2 answers
156 views

Commiting pathogen bundles?

Right now I am using Pathogen to manage bundles in my ~/.vim folder. I also have my public dotfiles repo which has all my configs, including my entire .vim folder. I don't use symlinks to do this, ...
  • 167