Git Integration - Magictt Neovim Config

Magictt integrates Git into your workflow with LazyGit terminal UI and several git-aware plugins for enhanced productivity.

LazyGit Integration

lazygit.nvim embeds the powerful LazyGit terminal UI directly into Neovim, providing a beautiful and efficient way to interact with Git.

What is LazyGit?

LazyGit is a simple terminal UI for git commands. It provides:

Visual interface for git operations
Keyboard-driven workflow
Staging/unstaging changes
Interactive commits
Branch management
Merge conflict resolution
Git log visualization
Stash management

Features

Full LazyGit Access: Complete LazyGit functionality within Neovim
Floating Window: Opens in a floating terminal window
Multiple Commands: Access different LazyGit modes
Seamless Integration: Stays in your editor workflow

Keybindings

Keybinding	Action	Description
`<leader>ll`	LazyGit	Open LazyGit in floating window

Available Commands

While the primary keybinding is <leader>ll, you can also use these commands:

:LazyGit - Open LazyGit (same as <leader>ll)
:LazyGitConfig - Open LazyGit configuration
:LazyGitCurrentFile - Open LazyGit for current file
:LazyGitFilter - Open LazyGit with filter
:LazyGitFilterCurrentFile - Filter LazyGit to current file

LazyGit Workflow

Basic Workflow

Open LazyGit

Press <leader>ll
LazyGit opens in floating window

Navigate Panels
- Use 1, 2, 3, 4, 5 to switch between panels
- 1: Status/Files
- 2: Branches
- 3: Commits
- 4: Stash

Stage Changes

Navigate to file
Press Space to stage/unstage
Press a to stage all

Commit Changes

Press c to commit
Type commit message
Press Enter to confirm

Push Changes
```
Press P (capital P)
Confirm push
```
Close LazyGit
```
Press q to quit
Returns to Neovim
```

Common LazyGit Operations

Staging and Committing

Press <leader>ll (open LazyGit)
Navigate files panel (panel 1)
Use j/k to navigate files
Press Space to stage file
Press c to commit
Type commit message
Press Enter
Press P to push
Press q to close

Branch Management

Press <leader>ll
Press 2 (switch to branches panel)
Press n to create new branch
Type branch name
Press Enter
Press Space to checkout branch

Viewing History

Press <leader>ll
Press 3 (commits panel)
Navigate with j/k
Press Enter to see commit details
View changed files and diffs

Merge Conflict Resolution

Press <leader>ll
Navigate to conflicted file
Press e to edit file
Resolve conflicts in Neovim
Save and close
Press Space to stage resolved file
Continue merge

Stashing Changes

Press <leader>ll
Press s to stash changes
Enter stash message
Press 4 to view stash panel
Press Space to apply stash
Press d to drop stash

LazyGit Keybindings (Inside LazyGit)

Key	Action
`1`, `2`, `3`, `4`, `5`	Switch between panels
`j` / `k`	Move down/up
`<C-d>` / `<C-u>`	Scroll down/up
`[` / `]`	Previous/next tab

Files Panel

Key	Action
`Space`	Stage/unstage file
`a`	Stage all files
`A`	Unstage all files
`d`	Discard changes
`e`	Edit file
`o`	Open file
`i`	Ignore file
`r`	Refresh files
`c`	Commit changes
`C`	Commit with editor

Branches Panel

Key	Action
`Space`	Checkout branch
`n`	New branch
`d`	Delete branch
`r`	Rebase branch
`M`	Merge into current
`f`	Fast-forward
`P`	Push branch
`p`	Pull branch

Commits Panel

Key	Action
`Enter`	View commit details
`c`	Checkout commit
`C`	Copy commit SHA
`r`	Revert commit
`R`	Rename commit
`d`	Delete commit
`s`	Squash commit

General

Key	Action
`?`	Open help
`q`	Quit LazyGit
`P`	Push
`p`	Pull
`R`	Refresh
`+` / `-`	Increase/decrease context

Configuration

Location: lua/magictt/plugins/lazygit.lua

return {
  "kdheepak/lazygit.nvim",
  lazy = true,  -- Lazy load until first use
  cmd = {
    "LazyGit",
    "LazyGitConfig",
    "LazyGitCurrentFile",
    "LazyGitFilter",
    "LazyGitFilterCurrentFile",
  },
  dependencies = {
    "nvim-lua/plenary.nvim",
  },
  keys = {
    { "<leader>ll", "<cmd>LazyGit<cr>", desc = "LazyGit" }
  },
}

Git-Aware Plugins

Several other Magictt plugins integrate with Git:

nvim-tree Git Integration

nvim-tree shows git status for files in the file explorer.

Git Status Icons

In nvim-tree, files are marked with git status:

✓ Staged file
✗ Deleted file
★ Renamed file
✚ Untracked file
● Modified file
◌ Ignored file

Features

Visual Indicators: See file status at a glance
Not Ignored: Shows .gitignored files (configurable)
Folder Status: Folders show aggregated status of contents

Configuration

From lua/magictt/plugins/nvim-tree.lua:

git = {
  ignore = false,  -- Show .gitignored files
}

Telescope Git Integration

Telescope has built-in git pickers (not configured by default, but available). You can add these git-related Telescope commands:

:Telescope git_commits    " View git commits
:Telescope git_bcommits   " View buffer's git commits
:Telescope git_branches   " List git branches
:Telescope git_status     " Git status (like git status)
:Telescope git_stash      " List stash items

To add keybindings, edit lua/magictt/plugins/telescope.lua:

keymap.set("n", "<leader>gc", "<cmd>Telescope git_commits<cr>")
keymap.set("n", "<leader>gb", "<cmd>Telescope git_branches<cr>")
keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>")

Lualine Git Integration

lualine automatically shows git information in the statusline:

Current branch name
Diff stats (added, modified, removed lines)

This provides constant awareness of:

Which branch you’re on
How many changes you have

TODO Comments Git Integration

todo-comments.nvim helps track TODO items that often relate to git workflows:

// TODO: Fix before merging PR
// FIXME: Regression from last commit
// HACK: Temporary until feature branch merges

Use <leader>ft to view all TODOs with Telescope. Use <leader>xt to view TODOs in Trouble.

Git Workflow Recommendations

Daily Workflow

Morning: Start Work

1. Pull latest changes
   - Press <leader>ll
   - Press p (pull)
   
2. Create feature branch
   - Press 2 (branches)
   - Press n (new branch)
   - Type "feature/my-feature"
   
3. Start coding
   - Close LazyGit (q)
   - Open files and code

During Development

1. Check file status in nvim-tree
   - Open tree: <leader>ee
   - See modified files with ● icon
   
2. Frequent commits
   - Press <leader>ll
   - Stage files (Space)
   - Commit (c)
   - Add message
   - Commit often!

Before Pushing

1. Review changes
   - Open LazyGit: <leader>ll
   - Check all staged files
   - Review diffs
   
2. Check TODOs
   - Press <leader>ft
   - Ensure no critical TODOs
   
3. Push to remote
   - In LazyGit: Press P
   - Confirm push

Merge Conflict Resolution

1. Identify conflicts
   - Open LazyGit: <leader>ll
   - Conflicted files shown with ✗
   
2. Edit conflict file
   - Navigate to file
   - Press e (edit)
   
3. Resolve in Neovim
   - Use search: /<<<<<<
   - Edit conflict sections
   - Remove conflict markers
   - Save file
   
4. Mark as resolved
   - Back in LazyGit
   - Press Space (stage)
   - Continue merge

Feature Branch Workflow

1. Create branch
   - <leader>ll → 2 → n → type name
   
2. Make changes and commit
   - Code → Stage → Commit (repeat)
   
3. Keep branch updated
   - Switch to main: <leader>ll → 2 → Space on main
   - Pull: p
   - Switch back to feature branch
   - Rebase: r
   
4. Push feature branch
   - <leader>ll → P
   
5. Create PR (outside Neovim)
   - Use GitHub CLI or web interface
   
6. After merge, cleanup
   - Switch to main
   - Pull
   - Delete feature branch: d

Keybindings Summary

Primary Git Keybinding

Keybinding	Action
`<leader>ll`	Open LazyGit

Keybinding	Action	Plugin
`<leader>ll`	LazyGit	lazygit.nvim
`<leader>ft`	Find TODOs	todo-comments (git-related)
`<leader>xt`	Trouble TODOs	trouble.nvim
`<leader>ee`	File tree (git status)	nvim-tree

Optional Telescope Git Keybindings

Add these to your config if desired:

Keybinding	Action
`<leader>gc`	Git commits
`<leader>gb`	Git branches
`<leader>gs`	Git status

Prerequisites

LazyGit Installation

LazyGit must be installed separately: macOS:

brew install lazygit

Ubuntu/Debian:

sudo add-apt-repository ppa:lazygit-team/release
sudo apt-get update
sudo apt-get install lazygit

Arch Linux:

sudo pacman -S lazygit

Windows:

scoop install lazygit
# or
choco install lazygit

From Source:

go install github.com/jesseduffield/lazygit@latest

Verify installation:

lazygit --version

Git Configuration

Ensure Git is properly configured:

git config --global user.name "Your Name"
git config --global user.email "[email protected]"

Customization

LazyGit Configuration

LazyGit has its own configuration file at:

macOS/Linux: ~/.config/lazygit/config.yml
Windows: %APPDATA%\lazygit\config.yml

Customize LazyGit behavior, colors, and keybindings in this file. See LazyGit docs for options.

Change LazyGit Keybinding

Edit lua/magictt/plugins/lazygit.lua:

keys = {
  { "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" }  -- Use <leader>gg instead
}

Add Telescope Git Pickers

Edit lua/magictt/plugins/telescope.lua to add:

keymap.set("n", "<leader>gc", "<cmd>Telescope git_commits<cr>", 
  { desc = "Git commits" })
keymap.set("n", "<leader>gb", "<cmd>Telescope git_branches<cr>", 
  { desc = "Git branches" })
keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>", 
  { desc = "Git status" })

Configure nvim-tree Git Display

Edit lua/magictt/plugins/nvim-tree.lua:

git = {
  enable = true,       -- Enable git integration
  ignore = true,       -- Hide .gitignored files
  show_on_dirs = true, -- Show status on directories
}

Troubleshooting

LazyGit Not Found

If you see “lazygit not found” error:

Install LazyGit (see Prerequisites)
Ensure it’s in your PATH: which lazygit
Restart Neovim

LazyGit Won’t Open

Check LazyGit works standalone: lazygit in terminal
Check Neovim terminal: :terminal lazygit
Check plugin is loaded: :Lazy

Git Status Not Showing in nvim-tree

Ensure you’re in a git repository: git status
Refresh tree: <leader>er
Check git is enabled in config

Tips and Tricks

LazyGit

Use ? inside LazyGit to see all keybindings
Press + or - to increase/decrease diff context
Use :LazyGitCurrentFile to focus on current file’s history
Customize LazyGit colors to match your theme

Git Workflow

Commit frequently with descriptive messages
Use TODO comments for work in progress
Review diffs before committing
Keep branches up to date with rebase
Use stash for temporary changes

Integration

Open LazyGit while file tree is open for full project view
Use Telescope to search commits: :Telescope git_commits
Check statusline for branch name and changes
Use <leader>xt to see all TODOs before committing

Plugin Overview

See all installed plugins

Keybindings

Complete keybinding reference

File Navigation

nvim-tree and other navigation tools

Get Started

Core Configuration

Plugins

Plugin Reference

Customization

Troubleshooting

​LazyGit Integration

​What is LazyGit?

​Features

​Keybindings

​Available Commands

​LazyGit Workflow

​Basic Workflow

​Common LazyGit Operations

​Staging and Committing

​Branch Management

​Viewing History

​Merge Conflict Resolution

​Stashing Changes

​LazyGit Keybindings (Inside LazyGit)

​Navigation

​Files Panel

​Branches Panel

​Commits Panel

​General

​Configuration

​Git-Aware Plugins

​nvim-tree Git Integration

​Git Status Icons

​Features

​Configuration

​Telescope Git Integration

​Lualine Git Integration

​TODO Comments Git Integration

​Git Workflow Recommendations

​Daily Workflow

​Morning: Start Work

​During Development

​Before Pushing

​Merge Conflict Resolution

​Feature Branch Workflow

​Keybindings Summary

​Primary Git Keybinding

​Git-Related Keybindings

​Optional Telescope Git Keybindings

​Prerequisites

​LazyGit Installation

​Git Configuration

​Customization

​LazyGit Configuration

​Change LazyGit Keybinding

​Add Telescope Git Pickers

​Configure nvim-tree Git Display

​Troubleshooting

​LazyGit Not Found

​LazyGit Won’t Open

​Git Status Not Showing in nvim-tree

​Tips and Tricks

​LazyGit

​Git Workflow

​Integration

​Related Documentation

Plugin Overview

Keybindings

File Navigation

​External Resources

Build docs developers (and LLMs) love

LazyGit Integration

What is LazyGit?

Features

Keybindings

Available Commands

LazyGit Workflow

Basic Workflow

Common LazyGit Operations

Staging and Committing

Branch Management

Viewing History

Merge Conflict Resolution

Stashing Changes

LazyGit Keybindings (Inside LazyGit)

Navigation

Files Panel

Branches Panel

Commits Panel

General

Configuration

Git-Aware Plugins

nvim-tree Git Integration

Git Status Icons

Features

Configuration

Telescope Git Integration

Lualine Git Integration

TODO Comments Git Integration

Git Workflow Recommendations

Daily Workflow

Morning: Start Work

During Development

Before Pushing

Merge Conflict Resolution

Feature Branch Workflow

Keybindings Summary

Primary Git Keybinding

Git-Related Keybindings

Optional Telescope Git Keybindings

Prerequisites

LazyGit Installation

Git Configuration

Customization

LazyGit Configuration

Change LazyGit Keybinding

Add Telescope Git Pickers

Configure nvim-tree Git Display

Troubleshooting

LazyGit Not Found

LazyGit Won’t Open

Git Status Not Showing in nvim-tree

Tips and Tricks

LazyGit

Git Workflow

Integration

Related Documentation

External Resources