gitsigns.nvim

gitsigns.nvim

CI Version License: MIT Gitter

Super fast git decorations implemented purely in Lua.

Preview

Hunk Actions Line Blame

Features

Requirements

Installation & Usage

Install using your package manager of choice.

For recommended setup with all batteries included:

require('gitsigns').setup()

Configuration can be passed to the setup function. Here is an example with most of the default settings:

require('gitsigns').setup {
  signs = {
    add          = { text = '┃' },
    change       = { text = '┃' },
    delete       = { text = '_' },
    topdelete    = { text = '‾' },
    changedelete = { text = '~' },
    untracked    = { text = '┆' },
  },
  signs_staged = {
    add          = { text = '┃' },
    change       = { text = '┃' },
    delete       = { text = '_' },
    topdelete    = { text = '‾' },
    changedelete = { text = '~' },
    untracked    = { text = '┆' },
  },
  signs_staged_enable = true,
  signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
  watch_gitdir = {
    follow_files = true
  },
  auto_attach = true,
  attach_to_untracked = false,
  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
  current_line_blame_opts = {
    virt_text = true,
    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
    delay = 1000,
    ignore_whitespace = false,
    virt_text_priority = 100,
  },
  current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
  sign_priority = 6,
  update_debounce = 100,
  status_formatter = nil, -- Use default
  max_file_length = 40000, -- Disable if file is longer than this (in lines)
  preview_config = {
    -- Options passed to nvim_open_win
    border = 'single',
    style = 'minimal',
    relative = 'cursor',
    row = 0,
    col = 1
  },
}

For information on configuring Neovim via lua please see [nvim-lua-guide].

Keymaps

Gitsigns provides an on_attach callback which can be used to setup buffer mappings.

Here is a suggested example:

require('gitsigns').setup{
  ...
  on_attach = function(bufnr)
    local gitsigns = require('gitsigns')

    local function map(mode, l, r, opts)
      opts = opts or {}
      opts.buffer = bufnr
      vim.keymap.set(mode, l, r, opts)
    end

    -- Navigation
    map('n', ']c', function()
      if vim.wo.diff then
        vim.cmd.normal({']c', bang = true})
      else
        gitsigns.nav_hunk('next')
      end
    end)

    map('n', '[c', function()
      if vim.wo.diff then
        vim.cmd.normal({'[c', bang = true})
      else
        gitsigns.nav_hunk('prev')
      end
    end)

    -- Actions
    map('n', '<leader>hs', gitsigns.stage_hunk)
    map('n', '<leader>hr', gitsigns.reset_hunk)
    map('v', '<leader>hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
    map('v', '<leader>hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
    map('n', '<leader>hS', gitsigns.stage_buffer)
    map('n', '<leader>hu', gitsigns.undo_stage_hunk)
    map('n', '<leader>hR', gitsigns.reset_buffer)
    map('n', '<leader>hp', gitsigns.preview_hunk)
    map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end)
    map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
    map('n', '<leader>hd', gitsigns.diffthis)
    map('n', '<leader>hD', function() gitsigns.diffthis('~') end)
    map('n', '<leader>td', gitsigns.toggle_deleted)

    -- Text object
    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
  end
}

Note this requires Neovim v0.7 which introduces vim.keymap.set. If you are using Neovim with version prior to v0.7 then use the following:

Click to expand ```lua require('gitsigns').setup { ... on_attach = function(bufnr) local function map(mode, lhs, rhs, opts) opts = vim.tbl_extend('force', {noremap = true, silent = true}, opts or {}) vim.api.nvim_buf_set_keymap(bufnr, mode, lhs, rhs, opts) end -- Navigation map('n', ']c', "&diff ? ']c' : 'Gitsigns next_hunk'", {expr=true}) map('n', '[c', "&diff ? '[c' : 'Gitsigns prev_hunk'", {expr=true}) -- Actions map('n', 'hs', ':Gitsigns stage_hunk') map('v', 'hs', ':Gitsigns stage_hunk') map('n', 'hr', ':Gitsigns reset_hunk') map('v', 'hr', ':Gitsigns reset_hunk') map('n', 'hS', 'Gitsigns stage_buffer') map('n', 'hu', 'Gitsigns undo_stage_hunk') map('n', 'hR', 'Gitsigns reset_buffer') map('n', 'hp', 'Gitsigns preview_hunk') map('n', 'hb', 'lua require"gitsigns".blame_line{full=true}') map('n', 'tb', 'Gitsigns toggle_current_line_blame') map('n', 'hd', 'Gitsigns diffthis') map('n', 'hD', 'lua require"gitsigns".diffthis("~")') map('n', 'td', 'Gitsigns toggle_deleted') -- Text object map('o', 'ih', ':Gitsigns select_hunk') map('x', 'ih', ':Gitsigns select_hunk') end } ``` </details> ## Non-Goals ### Implement every feature in [vim-fugitive] This plugin is actively developed and by one of the most well regarded vim plugin developers. Gitsigns will only implement features of this plugin if: it is simple, or, the technologies leveraged by Gitsigns (LuaJIT, Libuv, Neovim's API, etc) can provide a better experience. ### Support for other VCS There aren't any active developers of this plugin who use other kinds of VCS, so adding support for them isn't feasible. However a well written PR with a commitment of future support could change this. ## Status Line Use `b:gitsigns_status` or `b:gitsigns_status_dict`. `b:gitsigns_status` is formatted using `config.status_formatter`. `b:gitsigns_status_dict` is a dictionary with the keys `added`, `removed`, `changed` and `head`. Example: ```viml set statusline+=%{get(b:,'gitsigns_status','')} ``` For the current branch use the variable `b:gitsigns_head`. ## Comparison with [vim-gitgutter] Feature | gitsigns.nvim | vim-gitgutter | Note ---------------------------------------------------------|----------------------|-----------------------------------------------|-------- Shows signs for added, modified, and removed lines | :white_check_mark: | :white_check_mark: | Asynchronous | :white_check_mark: | :white_check_mark: | Runs diffs in-process (no IO or pipes) | :white_check_mark: * | | * Via [lua](https://github.com/neovim/neovim/pull/14536) or FFI. Supports Nvim's diff-linematch | :white_check_mark: * | | * Via [diff-linematch] Only adds signs for drawn lines | :white_check_mark: * | | * Via Neovims decoration API Updates immediately | :white_check_mark: | * | * Triggered on CursorHold Ensures signs are always up to date | :white_check_mark: * | | * Watches the git dir to do so Never saves the buffer | :white_check_mark: | :white_check_mark: :heavy_exclamation_mark: * | * Writes [buffer](https://github.com/airblade/vim-gitgutter/blob/0f98634b92da9a35580b618c11a6d2adc42d9f90/autoload/gitgutter/diff.vim#L106) (and index) to short lived temp files Quick jumping between hunks | :white_check_mark: | :white_check_mark: | Stage/reset/preview individual hunks | :white_check_mark: | :white_check_mark: | Preview hunks directly in the buffer (inline) | :white_check_mark: * | | * Via `preview_hunk_inline` Stage/reset hunks in range/selection | :white_check_mark: | :white_check_mark: :heavy_exclamation_mark: * | * Only stage Stage/reset all hunks in buffer | :white_check_mark: | | Undo staged hunks | :white_check_mark: | | Word diff in buffer | :white_check_mark: | | Word diff in hunk preview | :white_check_mark: | :white_check_mark: | Show deleted/changes lines directly in buffer | :white_check_mark: * | | * Via [virtual lines] Stage partial hunks | :white_check_mark: | | Hunk text object | :white_check_mark: | :white_check_mark: | Diff against index or any commit | :white_check_mark: | :white_check_mark: | Folding of unchanged text | | :white_check_mark: | Fold text showing whether folded lines have been changed | | :white_check_mark: | Load hunk locations into the quickfix or location list | :white_check_mark: | :white_check_mark: | Optional line highlighting | :white_check_mark: | :white_check_mark: | Optional line number highlighting | :white_check_mark: | :white_check_mark: | Optional counts on signs | :white_check_mark: | | Customizable signs and mappings | :white_check_mark: | :white_check_mark: | Customizable extra diff arguments | :white_check_mark: | :white_check_mark: | Can be toggled globally or per buffer | :white_check_mark: * | :white_check_mark: | * Through the detach/attach functions Statusline integration | :white_check_mark: | :white_check_mark: | Live blame in buffer (using virtual text) | :white_check_mark: | | Blame preview | :white_check_mark: | | Automatically follows open files moved with `git mv` | :white_check_mark: | | CLI with completion | :white_check_mark: | * | * Provides individual commands for some actions Open diffview with any revision/commit | :white_check_mark: | | As of 2022-09-01 ## Integrations ### [vim-fugitive] When viewing revisions of a file (via `:0Gclog` for example), Gitsigns will attach to the fugitive buffer with the base set to the commit immediately before the commit of that revision. This means the signs placed in the buffer reflect the changes introduced by that revision of the file. ### [trouble.nvim] If installed and enabled (via `config.trouble`; defaults to true if installed), `:Gitsigns setqflist` or `:Gitsigns setloclist` will open Trouble instead of Neovim's built-in quickfix or location list windows. ### [lspsaga.nvim] If you are using lspsaga.nvim you can config `code_action.extend_gitsigns` (default is false) to show the gitsigns action in lspsaga codeaction. ## Similar plugins - [mini.diff] - [coc-git] - [vim-gitgutter] - [vim-signify] [mini.diff]: https://github.com/echasnovski/mini.diff [coc-git]: https://github.com/neoclide/coc-git [diff-linematch]: https://github.com/neovim/neovim/pull/14537 [luv]: https://github.com/luvit/luv/blob/master/docs.md [nvim-lua-guide]: https://neovim.io/doc/user/lua-guide.html [release]: https://github.com/lewis6991/gitsigns.nvim/releases [trouble.nvim]: https://github.com/folke/trouble.nvim [vim-fugitive]: https://github.com/tpope/vim-fugitive [vim-gitgutter]: https://github.com/airblade/vim-gitgutter [vim-signify]: https://github.com/mhinz/vim-signify [virtual lines]: https://github.com/neovim/neovim/pull/15351 [lspsaga.nvim]: https://github.com/glepnir/lspsaga.nvim