GitCompanion.nvim

https://github.com/Darkskittlz/GitCompanion

A lightweight, terminal-native Git interface floating window for Neovim. Effortlessly inspect diffs, manage branches, stage modified files, manage stashes, and handle merges or commits without leaving your editor.

https://preview.redd.it/xsr684dghtjh1.png?width=1496&format=png&auto=webp&s=7682b4a92c41cce7370eae394061d748094c1941

Features

• Multi-View Interface: Fast cycling across Branches, Files Changed, and Stashes views.
• Live Code Changes Panel: Instant diff previewing for commits, staged/unstaged changes, and stashes.
• Streamlined Branch Operations: Create, checkout, merge (regular, squash), pull, and push branches directly from floating UI modals.
• Commit & Stash Workflows: Built-in title/description commit dialogs and quick stash creation/popping.
• Keyboard-First Navigation: Standard Vim motions (j, k, h, l) and explicit hotkeys for quick execution.
• Help Modal: Instant keymap reference available anywhere via ?.

Screenshots

File Status & Diffs

View staged/unstaged files and preview line diffs in real time.

https://preview.redd.it/uk6ckt9ihtjh1.png?width=1496&format=png&auto=webp&s=57e9adee4b350ae2724d9c4e42799a647628d12d

Stash Management

Inspect saved stash items alongside their code modifications.

https://preview.redd.it/4jswnkrjhtjh1.png?width=1496&format=png&auto=webp&s=4848990dd5c406046f56ad6eae1f3ccceeff0220

Commit Creation Modal

Dedicated floating modal to write commit titles and detailed descriptions.

https://preview.redd.it/ss6n8wvkhtjh1.png?width=1496&format=png&auto=webp&s=bd052ad9cb513acda9afb3e0b5ffaa333210fac3

Interactive Branch Operations

Create new branches or launch regular/squash merge workflows seamlessly.

Branch Creation

https://preview.redd.it/lhckxt9mhtjh1.png?width=940&format=png&auto=webp&s=795460565cda9b1321b9b1cf6e5cbc589ef31b09

Interactive Merging

https://preview.redd.it/22g3p3hnhtjh1.png?width=980&format=png&auto=webp&s=921abf8da03df103ce40914e707ab3efb0963281

Built-in Keymap Help Modal

Press ? inside any window to toggle the interactive cheat sheet.

https://preview.redd.it/k6i73urohtjh1.png?width=1120&format=png&auto=webp&s=798dca10c7d6a93bf5010aeefd26ef7d5962a9c4

Installation

Using lazy.nvim

{
  'Darkskittlz/GitCompanion',
  dependencies = {
    'nvim-lua/plenary.nvim',
  },
  keys = {
    { '<leader>gc', '<cmd>GitCompanion<cr>', desc = 'Toggle GitCompanion' },
  },
  opts = {},
}