Git integration - Snehil's Neovim Configuration

This configuration provides a complete Git workflow through three main plugins:

Gitsigns

Inline git blame, hunk operations, and change indicators

Neogit

Full interactive Git UI for staging, committing, and complex operations

CodeDiff

Side-by-side diff viewer with file history and staging

Gitsigns

Gitsigns provides git decorations and hunk-level operations directly in your buffers.

Visual indicators

Changes are shown in the sign column and with number highlighting:

lua/plugins/git.lua

signs = {
  add = { text = "┃" },
  change = { text = "┃" },
  delete = { text = "_" },
  topdelete = { text = "‾" },
  changedelete = { text = "~" },
  untracked = { text = "┆" },
}

Both staged and unstaged changes are shown with separate sign columns (signs_staged_enable = true).

Key	Action	Description
`[g`	Previous hunk	Jump to previous changed block
`]g`	Next hunk	Jump to next changed block
`<leader>gp`	Preview inline	Show diff inline in buffer
`<leader>gP`	Preview popup	Show diff in floating window

lua/plugins/git.lua

{
  "[g",
  function()
    require("gitsigns").nav_hunk("prev", { wrap = true, target = "all" })
  end,
  desc = "<- hunk",
}

Git blame

Multiple ways to view blame information:

Line blame
Buffer blame
Inline blame mode

<leader>gb - Show commit info for current line in a popup

function()
  require("gitsigns").blame_line()
end

<leader>gB - Show blame annotations for entire buffer

function()
  require("gitsigns").blame()
end

<leader>GB - Toggle persistent inline blame on every line

function()
  require("gitsigns").toggle_current_line_blame()
end

Custom blame formatter

The blame formatter shows author, message, and formatted date:

lua/plugins/git.lua

current_line_blame_formatter = function(name, blame_info, opts)
  if blame_info.author == "Not Committed Yet" then
    return { { " Not committed yet", "GitSignsCurrentLineBlame" } }
  end
  -- Replace your name with "You"
  local author = blame_info.author
  local git_user = vim.fn.system("git config user.name"):gsub("\n", "")
  if author == git_user then
    author = "You"
  end
  local date = os.date("%d %b %Y, %H:%M", tonumber(blame_info.author_time))
  local text = string.format(" %s, %s - %s", author, blame_info.summary, date)
  return { { text, "GitSignsCurrentLineBlame" } }
end

Staging operations

Stage hunk

<leader>ga - Stage the current hunk (git add this hunk)

function()
  require("gitsigns").stage_hunk()
end

Stage buffer

<leader>gA - Stage all changes in the current buffer

function()
  require("gitsigns").stage_buffer()
end

Unstage hunk

<leader>gu - Toggle stage state for current hunk (unstage if staged)

function()
  require("gitsigns").stage_hunk()
end

Reset operations

Reset operations discard changes permanently. Use with caution.

Key	Action	Description
`<leader>gr`	Reset hunk	Discard changes in current hunk
`<leader>gR`	Reset buffer	Discard ALL changes in buffer
`<leader>gD`	Diff HEAD	Open split diff against last commit

Stash management

lua/plugins/git.lua

{
  "<leader>gS",
  function()
    Snacks.picker.git_stash()
  end,
  desc = "[S]tash (Snacks)",
}

Stash picker allows you to view, apply, and drop stashes interactively.

CodeDiff

CodeDiff provides a VSCode-like side-by-side diff interface with staging support.

Main features

Side-by-side diff

Compare files with move detection like VSCode

File staging

Stage/unstage files directly in the explorer

File history

Browse commit history with diffs

Merge-base diffs

PR-like diffs since branching point

Key bindings

Key	Command	Description
`<leader>dd`	`:CodeDiff`	Toggle diff explorer
`<leader>dh`	`:CodeDiff history`	Browse all commit history
`<leader>d.`	`:CodeDiff history %`	History for current file
`<leader>df`	`:CodeDiff file HEAD`	Diff current file vs HEAD
`<leader>dm`	`:CodeDiff origin/main...HEAD`	Merge-base diff vs origin/main
`<leader>dM`	Custom	Prompt for branch to compare

Merge-base diff example

lua/plugins/git.lua

{
  "<leader>dm",
  "<cmd>CodeDiff origin/main...HEAD<cr>",
  desc = "[m]erge-base diff vs origin/main",
}

This shows only changes introduced since your branch diverged from origin/main, perfect for reviewing PRs.

Custom branch comparison

lua/plugins/git.lua

{
  "<leader>dM",
  function()
    local branch = vim.fn.input("Compare with branch: ", "origin/")
    if branch ~= "" and branch ~= "origin/" then
      vim.cmd("CodeDiff " .. branch .. "...HEAD")
    end
  end,
  desc = "[M]erge-base diff vs specific branch",
}

Configuration

lua/plugins/git.lua

opts = {
  diff = {
    compute_moves = true, -- show moved lines similar to vscode
  },
  explorer = {
    flatten_dirs = false,
  },
  keymaps = {
    view = {
      align_move = "gm", -- align cursor with corresponding line in other pane
    },
  },
}

Press g? inside CodeDiff for a full list of available keybindings.

Neogit

Neogit provides a Magit-like interface for complex Git operations.

Opening Neogit

Key	Command	Description
`<leader>gn`	`:Neogit`	Open Neogit status panel
`<leader>gc`	`:Neogit commit`	Open commit popup directly

Neogit features

Interactive staging

Stage/unstage files and hunks with single keypress

Commit interface

Write commits with syntax highlighting and spell check

Push/pull

Push, pull, fetch with progress indicators

Rebase operations

Interactive rebase, squash, reword commits

Branch management

Create, switch, delete branches

Stash operations

Create and apply stashes from the z menu

Configuration

lua/plugins/git.lua

opts = {
  integrations = {
    codediff = true,
    snacks = true,
  },
  diff_viewer = "codediff",
  graph_style = vim.g.neovide and "ascii" or "kitty",
  process_spinner = true,
}

Neogit uses CodeDiff for viewing diffs and Snacks for pickers, providing a seamless integrated experience.

Common workflows

Stage and commit
Interactive rebase
Branch operations

Open Neogit with <leader>gn
Navigate to unstaged files with j/k
Press s to stage a file or hunk
Press c then c to open commit editor
Write message and save (:wq)

Open Neogit with <leader>gn
Navigate to commit log with l then l
Move to commit you want to rebase onto
Press r for rebase menu, then i for interactive
Edit commits, then continue with :NeogitRebaseContinue

Open Neogit with <leader>gn
Press b to open branch menu
Available options:
- b - checkout branch
- c - create branch
- d - delete branch
- r - rename branch

Press ? inside Neogit to see all available keybindings for the current context.

Atone

Time-based blame visualization plugin:

lua/plugins/git.lua

{
  "XXiaoA/atone.nvim",
  cmd = "Atone",
  opts = {},
}

Use :Atone to visualize code age with color gradients.

Git workflow summary

Quick hunk operations

Use Gitsigns ([g, ]g, <leader>ga, <leader>gr) for quick inline changes

Review changes

Use CodeDiff (<leader>dd) for side-by-side review before staging

Complex operations

Use Neogit (<leader>gn) for commits, pushes, rebases, and branch management

Line history

Use Snacks picker (<leader>gl) to see which commits modified specific lines

PR review

Use merge-base diff (<leader>dm) to review changes since branching

Integration with Snacks

Additional Git commands from Snacks.nvim:

Key	Command	Description
`<leader>gl`	Git log line	Commits that modified current line
`<leader>go`	Git browse	Open file on GitHub/GitLab in browser
`<leader>gd`	Git diff	Browse all changed hunks in picker
`<leader>gS`	Git stash	Browse and manage stashes

See the Snacks.nvim documentation for more details.

Get Started

Core Configuration

Language Support

Plugin Guide

Customization

Gitsigns

Neogit

CodeDiff

​Gitsigns

​Visual indicators

​Hunk navigation

​Git blame

​Custom blame formatter

​Staging operations

​Reset operations

​Stash management

​CodeDiff

​Main features

Side-by-side diff

File staging

File history

Merge-base diffs

​Key bindings

​Merge-base diff example

​Custom branch comparison

​Configuration

​Neogit

​Opening Neogit

​Neogit features

Interactive staging

Commit interface

Push/pull

Rebase operations

Branch management

Stash operations

​Configuration

​Common workflows

​Atone

​Git workflow summary

​Integration with Snacks

Build docs developers (and LLMs) love

Gitsigns

Visual indicators

Hunk navigation

Git blame

Custom blame formatter

Staging operations

Reset operations

Stash management

CodeDiff

Main features

Key bindings

Merge-base diff example

Custom branch comparison

Configuration

Neogit

Opening Neogit

Neogit features

Configuration

Common workflows

Atone

Git workflow summary

Integration with Snacks