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.
97 questions
4
votes
2
answers
260
views
Neovim git merge problem
When using neovim as a git mergetool, im having troubles accepting entire blocks of conflicts from either source.
<<<<<<< HEAD
BRANCH 1
=======
BRANCH 2 CHANGES
>>>>&...
- 61
1
vote
3
answers
235
views
Automatically apply Vim settings when editing Git commit messages
When using Vim to edit commit messages I want the modeline from the ~/.gitmessage template to be recognised, so I can use the colorcolumn feature to highlight the conventional line length limits.
How ...
- 252
1
vote
3
answers
261
views
How develop a vim plugin repository, live testing it, making proper use of git?
I have come across the following problematic: How to develop a Vim plugin using a local repository, while you are at the same time testing its changes, doing commits and so forth.
So in my case I'm ...
- 21
2
votes
2
answers
258
views
How to select all lines containing a string, then do a search and replace on them?
I want to squash or drop a lot of commits during a rebase. Those commits have messages that start with TEMP, e.g.:
pick 123456 TEMP: test1
pick abcdef TEMP: test2
pick asdfgh TEMP: test3
I want to ...
- 135
1
vote
3
answers
420
views
How to pass the current line number to a shell command as an argument?
I need to get information about the last person who edited the file, so I use git blame to achieve this. All I need is to run git blame -L X,Y and have it pasted in the Vim window.
If I attempt one of ...
- 121
0
votes
0
answers
65
views
How do I gray out .gitignore with telescope?
The behavior I have now is that all files and folders specified in Telescope are not shown at all while I use NVChad. Is there a way to gray them out instead, so I can still see them, but just give ...
- 1
0
votes
1
answer
343
views
Looking through previous file versions and restoring hunks?
I want to be able to see a list of previous versions of a file in a git repo, select one of them to see a diff, and choose which parts from that version I want to restore, something like git checkout -...
- 435
0
votes
1
answer
83
views
Go to last changed line when opening file
When I open a file with unstaged changes it would be ideal for me to automatically jump to to them, I currently use GitGutterNextHunk from airblade/vim-gitgutter.
Also as a bonus, I would also like to ...
- 121
0
votes
0
answers
54
views
Cannot run file in ftdetect folder using Vundle
I am using Vim 7.4 on Linux with Vundle and Git. I am writing my own plugin called potion (following an example in the book LEARN VIMSCRIPT THE HARD WAY by Steve Losh) that is stored in my GitHub ...
- 489
-2
votes
1
answer
170
views
Cannot install plugins using Vundle and Git v1.8.3.1
I am running the :PluginInstall command with Vundle (Vim version 7.4) and attempts to run :PluginInstall will (try to) run a command like the following:
git clone --depth 1 --recursive --shallow-...
- 489
4
votes
1
answer
351
views
Check for diff mode while using git mergetool
I am using Neovim v0.10.0 and have the following config for git difftool:
[diff]
tool = nvimdiff
[difftool]
prompt = False
trustExitCode = true
[difftool "nvimdiff"]
cmd = ...
- 41
0
votes
1
answer
532
views
Use LspConfig root_dir in Neogit cwd
I'm trying to setup Neogit to open in my workspace directory instead of cwd. The problem is that I use multi root workspaces, so I usually set my cwd to be workspace1/... My initial try was to use ...
- 1
0
votes
1
answer
250
views
How to configure git config to use MacVim and zsh to use Vim bundled in MacVim?
The following is an excerpt of my .gitconfig
[core]
editor = mvim
autocrlf = false
pager = less -FX
commentchar = "#"
[diff]
tool = vimdiff
guitool = vimdiff
[merge]
...
- 1,133
2
votes
1
answer
641
views
Show git branch icon in lightline
Here is my code from .vimrc but is not showing any icon near the branch name
I'm using
Plug 'itchyny/lightline.vim' " Lightline UI
Plug 'tpope/vim-fugitive' " Git wrapper for Vim
Plug '...
- 245
0
votes
1
answer
223
views
Working with multiple git branches of Neovim config
I am working with multiple NVim configs through multiple git branches but it appears to be broken like it doesn't update the config after I switch branch and restart Neovim. Restarting my computer ...
- 795