Neovim 系列（九）：Git 整合工作流——在編輯器中完成所有 Git 操作

-- lua/plugins/gitsigns.lua
return {
  "lewis6991/gitsigns.nvim",
  event = "BufReadPost",
  config = function()
    require("gitsigns").setup({
      signs = {
        add          = { text = "│" },
        change       = { text = "│" },
        delete       = { text = "_" },
        topdelete    = { text = "‾" },
        changedelete = { text = "~" },
      },
      on_attach = function(bufnr)
        local gs = package.loaded.gitsigns
        local opts = { buffer = bufnr }

        -- 導航：在 hunk（變更區塊）之間跳轉
        vim.keymap.set("n", "]h", gs.next_hunk, opts)
        vim.keymap.set("n", "[h", gs.prev_hunk, opts)

        -- Stage / Unstage
        vim.keymap.set("n", "<leader>hs", gs.stage_hunk, opts)
        vim.keymap.set("n", "<leader>hr", gs.reset_hunk, opts)
        vim.keymap.set("v", "<leader>hs", function()
          gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
        end, opts)
        vim.keymap.set("v", "<leader>hr", function()
          gs.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
        end, opts)

        -- Stage / Reset 整個 buffer
        vim.keymap.set("n", "<leader>hS", gs.stage_buffer, opts)
        vim.keymap.set("n", "<leader>hR", gs.reset_buffer, opts)

        -- Undo stage
        vim.keymap.set("n", "<leader>hu", gs.undo_stage_hunk, opts)

        -- Preview hunk
        vim.keymap.set("n", "<leader>hp", gs.preview_hunk, opts)

        -- Blame
        vim.keymap.set("n", "<leader>hb", function()
          gs.blame_line({ full = true })
        end, opts)
        vim.keymap.set("n", "<leader>tb", gs.toggle_current_line_blame, opts)

        -- Diff
        vim.keymap.set("n", "<leader>hd", gs.diffthis, opts)
      end,
    })
  end,
}

1. 編輯程式碼（sign column 自動顯示變更標記）
2. 用 ]h / [h 在變更區塊間跳轉，檢查修改內容
3. 用 <leader>hp 預覽 hunk，確認要保留的變更
4. 用 <leader>hs stage 個別 hunk（或 <leader>hS stage 整個檔案）
5. 用 <leader>hr 撤銷不需要的變更

brew install lazygit

-- 加在 keymaps.lua 或另建 lua/plugins/lazygit.lua
vim.keymap.set("n", "<leader>lg", function()
  -- 用浮動視窗開啟 lazygit
  local buf = vim.api.nvim_create_buf(false, true)
  vim.api.nvim_open_win(buf, true, {
    relative = "editor",
    width = math.floor(vim.o.columns * 0.9),
    height = math.floor(vim.o.lines * 0.9),
    col = math.floor(vim.o.columns * 0.05),
    row = math.floor(vim.o.lines * 0.05),
    style = "minimal",
    border = "rounded",
  })
  vim.fn.termopen("lazygit", {
    on_exit = function()
      vim.api.nvim_buf_delete(buf, { force = true })
    end,
  })
  vim.cmd("startinsert")
end, { desc = "Open lazygit" })

-- lua/plugins/lazygit.lua
return {
  "kdheepak/lazygit.nvim",
  cmd = "LazyGit",
  dependencies = { "nvim-lua/plenary.nvim" },
  keys = {
    { "<leader>lg", "<cmd>LazyGit<cr>", desc = "Open LazyGit" },
  },
}

-- lua/plugins/diffview.lua
return {
  "sindrets/diffview.nvim",
  cmd = { "DiffviewOpen", "DiffviewFileHistory" },
  keys = {
    { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Open diff view" },
    { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
    { "<leader>gH", "<cmd>DiffviewFileHistory<cr>", desc = "Branch history" },
  },
  config = function()
    require("diffview").setup({
      enhanced_diff_hl = true,
      view = {
        default = {
          layout = "diff2_horizontal",
        },
      },
    })
  end,
}

1. 編輯程式碼
   - sign column 自動顯示哪些行被修改了

2. 檢查變更
   - ]h / [h 跳到變更區塊
   - <leader>hp 預覽每個 hunk 的內容
   - <leader>gd 開啟 diff view 總覽所有變更

3. Staging
   - <leader>hs 逐個 hunk stage（精細控制）
   - 或開啟 lazygit (<leader>lg) 用更直覺的方式 stage

4. Commit
   - 在 lazygit 中按 c 寫 commit message 並提交

5. Push
   - 在 lazygit 中按 P push 到 remote

- <leader>gh  → 查看當前檔案的歷史（誰、何時、改了什麼）
- <leader>hb  → 查看當前行的 blame（這行是誰寫的）
- <leader>tb  → 開啟行內 blame（每行旁邊都顯示作者和時間）

- <leader>lg  → 開啟 lazygit
  - 在 Branches 面板中切換、新建、合併分支
  - 在 Commits 面板中 cherry-pick、rebase