Skip to content

Latest commit

 

History

History
88 lines (67 loc) · 3.38 KB

git.md

File metadata and controls

88 lines (67 loc) · 3.38 KB
Raw

I mostly use git from the command line, but there are some vim-git integrations that I really like, listed below.

For the repository where I spend the majority of my working time, I use git worktrees to manage several ongoing items:

  • main - worktree that tracks the main branch
  • feature - current feature work
  • review - for code review
  • tmp
  • hack

The worktrees are added from the primary worktree with git worktree add ../feature and they let me have several branches checked out at the same time. I don't create new worktrees, I reuse the ones I have.

To work on a new feature I cd to feature/, create a new branch and launch my editor from there.

These worktrees share one .git (only need to fetch once, and saves disk space compared to having several full clones) and they also share one stash (which means I can git stash in one worktree and git stash pop in another).

git branch -vv lists all my local branches and in what worktree they are checked out in.

To review a branch I use git switch -d origin/feature_A_from_coworker to avoid creating a local copy of the branch.

git-jump

The git source contains several peripheral tools, git-jump is one of them. It can be used to start vim with a bunch of location loaded into quickfix list:

  • git jump grep banana quickly find all bananas in the repo
  • git jump merge quickly fix all merge conflicts (e.g. when rebasing)
  • git jump diff revisit all positions of unstaged changes
  • git jump diff HEAD~

vim-fugitive

The parts of vim-fugitive I use the most:

  • :Ggrep banana - find all bananas in the repo
  • :Git blame, mappings:
    • P reblame at commit~
    • o view the patch
  • :Gvsplit main:% - inspect the current file's state at branch "main"
  • :Gdiffsplit main:% compare with main branch

Related config:

Plug 'tpope/vim-fugitive'          
nnoremap <leader>g :Ggrep -q <c-r><c-w>
nnoremap gb <cmd>Git blame<cr>

fzf

fzf's vim plugin has the handy command :Gfiles to quickly find files in a git repo. I also have :Files %:h mapped to quickly find other files in the same folder as the current file.

Related [config] (https://github.com/kaddkaka/dotfiles/blob/main/dot_config/nvim/small.vim#L47):

Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'

map <leader>f <cmd>GFiles<cr>   
map <leader>F <cmd>Files<cr>    
map <leader>l <cmd>Files %:h<cr>

tig

I use tig to get an overview the commit history. It has builtin mapping for pressing e at a change in a diff to immediately open vim at that locaiton.

I have some bindings for quickly rebasing the top of my commit history:

bind main R !git rebase -i %(commit) --keep-empty
bind diff R !git rebase -i %(commit) --keep-empty
bind main S !git rebase -i %(commit) --autosquash
bind diff S !git rebase -i %(commit) --autosquash

When I want to fix comments from a Merge Review I have a custom script bound to E that starts a rebase edit session with all changes of that commit in quickfix list with git-jump.

bind main E <tig_edit %(commit)
bind diff E <tig_edit %(commit)

#!/bin/bash
echo "Editing: $1"
GIT_EDITOR='sed -i 1s/pick/edit/' git rebase -i "$1"~
git jump diff HEAD~
git commit -a --fixup=HEAD --no-edit