jesseduffield · josephschmitt · Jan 18, 2026 · Jan 18, 2026 · Jan 18, 2026 · Jan 18, 2026
diff --git a/docs-master/Config.md b/docs-master/Config.md
@@ -465,6 +465,16 @@ git:
     # passing the `--all` argument to `git log`)
     showWholeGraph: false
 
+  # Config for git-spice integration
+  spice:
+    # If true, enable git-spice integration when the gs binary is available
+    enabled: true
+
+    # LogFormat for displaying git-spice stacks: 'short' | 'long'
+    # 'short' shows basic branch hierarchy
+    # 'long' shows additional PR info, sync status, and commits
+    logFormat: short
+
   # How branches are sorted in the local branches view.
   # One of: 'date' (default) | 'recency' | 'alphabetical'
   # Can be changed from within Lazygit with the Sort Order menu (`s`) in the

diff --git a/docs-master/keybindings/Keybindings_en.md b/docs-master/keybindings/Keybindings_en.md
@@ -328,6 +328,32 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <esc> `` | Exit back to side panel |  |
 | `` / `` | Search the current view by text |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | View commits |  |
+| `` s `` | Squash |  |
+| `` f `` | Fixup |  |
+| `` r `` | Reword |  |
+| `` d `` | Drop |  |
+| `` e `` | Edit |  |
+| `` A `` | Amend |  |
+| `` g `` | Reset |  |
+| `` C `` | Copy (cherry-pick) |  |
+| `` y `` | Copy commit attribute to clipboard |  |
+| `` <space> `` | Checkout |  |
+| `` <c-j> `` | Move commit down one |  |
+| `` <c-k> `` | Move commit up one |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | View worktree options |  |
+| `` / `` | Filter the current view by text |  |
+
 ## Stash
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_ja.md b/docs-master/keybindings/Keybindings_ja.md
@@ -60,6 +60,32 @@ _凡例：`＜c-b＞` はctrl+b、`＜a-b＞` はalt+b、`B` はshift+bを意味
 | `` <enter> `` | 確認 |  |
 | `` <esc> `` | 閉じる/キャンセル |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | コミットを表示 |  |
+| `` s `` | スカッシュ |  |
+| `` f `` | フィックスアップ |  |
+| `` r `` | メッセージ変更 |  |
+| `` d `` | 削除 |  |
+| `` e `` | 編集 |  |
+| `` A `` | 修正 |  |
+| `` g `` | リセット |  |
+| `` C `` | コピー（チェリーピック） |  |
+| `` y `` | コミット属性をクリップボードにコピー |  |
+| `` <space> `` | チェックアウト（ブランチの切り替え） |  |
+| `` <c-j> `` | コミットを1つ下に移動 |  |
+| `` <c-k> `` | コミットを1つ上に移動 |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | メインビューにフォーカス |  |
+| `` w `` | ワークツリーオプションを表示 |  |
+| `` / `` | 現在のビューをテキストでフィルタリング |  |
+
 ## コミット
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_ko.md b/docs-master/keybindings/Keybindings_ko.md
@@ -88,6 +88,32 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 검색 시작 |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 커밋 보기 |  |
+| `` s `` | 스쿼시 |  |
+| `` f `` | Fixup |  |
+| `` r `` | 커밋메시지 변경 |  |
+| `` d `` | Drop |  |
+| `` e `` | Edit |  |
+| `` A `` | Amend |  |
+| `` g `` | View reset options |  |
+| `` C `` | 커밋을 복사 (cherry-pick) |  |
+| `` y `` | 커밋 attribute 복사 |  |
+| `` <space> `` | 체크아웃 |  |
+| `` <c-j> `` | 커밋을 1개 아래로 이동 |  |
+| `` <c-k> `` | 커밋을 1개 위로 이동 |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | View worktree options |  |
+| `` / `` | Filter the current view by text |  |
+
 ## Stash
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_nl.md b/docs-master/keybindings/Keybindings_nl.md
@@ -306,6 +306,32 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <esc> `` | Exit back to side panel |  |
 | `` / `` | Start met zoeken |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | Bekijk commits |  |
+| `` s `` | Squash |  |
+| `` f `` | Fixup |  |
+| `` r `` | Hernoem commit |  |
+| `` d `` | Laten vallen |  |
+| `` e `` | Edit |  |
+| `` A `` | Amend |  |
+| `` g `` | Bekijk reset opties |  |
+| `` C `` | Kopieer commit (cherry-pick) |  |
+| `` y `` | Copy commit attribute to clipboard |  |
+| `` <space> `` | Uitchecken |  |
+| `` <c-j> `` | Verplaats commit 1 naar beneden |  |
+| `` <c-k> `` | Verplaats commit 1 naar boven |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | View worktree options |  |
+| `` / `` | Filter the current view by text |  |
+
 ## Staging
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_pl.md b/docs-master/keybindings/Keybindings_pl.md
@@ -321,6 +321,32 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
 | `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | Pokaż commity |  |
+| `` s `` | Scal |  |
+| `` f `` | Poprawka |  |
+| `` r `` | Przeformułuj |  |
+| `` d `` | Usuń |  |
+| `` e `` | Edytuj |  |
+| `` A `` | Popraw |  |
+| `` g `` | Reset |  |
+| `` C `` | Kopiuj (cherry-pick) |  |
+| `` y `` | Kopiuj atrybut commita do schowka |  |
+| `` <space> `` | Przełącz |  |
+| `` <c-j> `` | Przesuń commit w dół |  |
+| `` <c-k> `` | Przesuń commit w górę |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
+| `` / `` | Filtruj bieżący widok po tekście |  |
+
 ## Status
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_pt.md b/docs-master/keybindings/Keybindings_pt.md
@@ -337,6 +337,32 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <esc> `` | Exit back to side panel |  |
 | `` / `` | Search the current view by text |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | View commits |  |
+| `` s `` | Squash |  |
+| `` f `` | Fixup |  |
+| `` r `` | Reword |  |
+| `` d `` | Descartar |  |
+| `` e `` | Editar |  |
+| `` A `` | Modificar |  |
+| `` g `` | Restaurar |  |
+| `` C `` | Copiar (cherry-pick) |  |
+| `` y `` | Copy commit attribute to clipboard |  |
+| `` <space> `` | Verificar |  |
+| `` <c-j> `` | Mover commit um para baixo |  |
+| `` <c-k> `` | Mover o commit um para cima |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | View worktree options |  |
+| `` / `` | Filter the current view by text |  |
+
 ## Stash
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_ru.md b/docs-master/keybindings/Keybindings_ru.md
@@ -60,6 +60,32 @@ _Связки клавиш_
 | `` <enter> `` | Подтвердить |  |
 | `` <esc> `` | Закрыть/отменить |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | Просмотреть коммиты |  |
+| `` s `` | Объединить коммиты (Squash) |  |
+| `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита (Fixup)  |  |
+| `` r `` | Перефразировать коммит |  |
+| `` d `` | Удалить припрятанные изменения из хранилища |  |
+| `` e `` | Edit |  |
+| `` A `` | Amend |  |
+| `` g `` | Просмотреть параметры сброса |  |
+| `` C `` | Скопировать отобранные коммит (cherry-pick) |  |
+| `` y `` | Скопировать атрибут коммита |  |
+| `` <space> `` | Переключить |  |
+| `` <c-j> `` | Переместить коммит вниз на один |  |
+| `` <c-k> `` | Переместить коммит вверх на один |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | View worktree options |  |
+| `` / `` | Filter the current view by text |  |
+
 ## Worktrees
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_zh-CN.md b/docs-master/keybindings/Keybindings_zh-CN.md
@@ -53,6 +53,32 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` ] `` | 下一个标签 |  |
 | `` [ `` | 上一个标签 |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 查看提交 |  |
+| `` s `` | 压缩(Squash) |  |
+| `` f `` | 修正 （fixup） |  |
+| `` r `` | 改写提交 |  |
+| `` d `` | 删除 |  |
+| `` e `` | 编辑(Edit) |  |
+| `` A `` | 修补(Amend) |  |
+| `` g `` | 查看重置选项 |  |
+| `` C `` | 复制提交(拣选) |  |
+| `` y `` | 复制提交属性到剪贴板 |  |
+| `` <space> `` | 检出 |  |
+| `` <c-j> `` | 下移提交 |  |
+| `` <c-k> `` | 上移提交 |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | 聚焦主视图 |  |
+| `` w `` | 查看工作区选项 |  |
+| `` / `` | 通过文本过滤当前视图 |  |
+
 ## 子提交
 
 | Key | Action | Info |

diff --git a/docs-master/keybindings/Keybindings_zh-TW.md b/docs-master/keybindings/Keybindings_zh-TW.md
@@ -60,6 +60,32 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 | `` <enter> `` | 確認 |  |
 | `` <esc> `` | 關閉/取消 |  |
 
+## Stacks
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 檢視提交 |  |
+| `` s `` | 壓縮 (Squash) |  |
+| `` f `` | 修復 (Fixup) |  |
+| `` r `` | 改寫提交 |  |
+| `` d `` | 捨棄 |  |
+| `` e `` | 編輯 |  |
+| `` A `` | 修改 |  |
+| `` g `` | 檢視重設選項 |  |
+| `` C `` | 複製提交 (揀選) |  |
+| `` y `` | 複製提交屬性 |  |
+| `` <space> `` | 檢出 |  |
+| `` <c-j> `` | 向下移動提交 |  |
+| `` <c-k> `` | 向上移動提交 |  |
+| `` S `` | Stack operations |  |
+| `` G `` | Stack navigation |  |
+| `` V `` | Toggle log format | Toggle between short and long format. Short shows basic hierarchy, long shows PR info and sync status. |
+| `` n `` | Create branch (on selected) |  |
+| `` N `` | Create commit |  |
+| `` 0 `` | Focus main view |  |
+| `` w `` | 檢視工作目錄選項 |  |
+| `` / `` | 搜尋 |  |
+
 ## 主面板 (補丁生成)
 
 | Key | Action | Info |

diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go
@@ -129,6 +129,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"suggestions":       tr.SuggestionsCheatsheetTitle,
 		"extras":            tr.ExtrasTitle,
 		"worktrees":         tr.WorktreesTitle,
+		"spiceStacks":       tr.SpiceStacksTitle,
 	}
 
 	title, ok := contextTitleMap[str]

diff --git a/pkg/commands/git.go b/pkg/commands/git.go
@@ -37,6 +37,7 @@ type GitCommand struct {
 	WorkingTree *git_commands.WorkingTreeCommands
 	Bisect      *git_commands.BisectCommands
 	Worktree    *git_commands.WorktreeCommands
+	Spice       *git_commands.SpiceCommands
 	Version     *git_commands.GitVersion
 	RepoPaths   *git_commands.RepoPaths
 
@@ -52,6 +53,7 @@ type Loaders struct {
 	RemoteLoader       *git_commands.RemoteLoader
 	StashLoader        *git_commands.StashLoader
 	TagLoader          *git_commands.TagLoader
+	SpiceStackLoader   *git_commands.SpiceStackLoader
 	Worktrees          *git_commands.WorktreeLoader
 }
 
@@ -137,6 +139,7 @@ func NewGitCommandAux(
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)
 	worktreeCommands := git_commands.NewWorktreeCommands(gitCommon)
 	blameCommands := git_commands.NewBlameCommands(gitCommon)
+	spiceCommands := git_commands.NewSpiceCommands(gitCommon)
 
 	branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, configCommands)
 	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
@@ -146,6 +149,7 @@ func NewGitCommandAux(
 	worktreeLoader := git_commands.NewWorktreeLoader(gitCommon)
 	stashLoader := git_commands.NewStashLoader(cmn, cmd)
 	tagLoader := git_commands.NewTagLoader(cmn, cmd)
+	spiceStackLoader := git_commands.NewSpiceStackLoader(cmn, spiceCommands)
 
 	return &GitCommand{
 		Blame:       blameCommands,
@@ -167,6 +171,7 @@ func NewGitCommandAux(
 		Bisect:      bisectCommands,
 		WorkingTree: workingTreeCommands,
 		Worktree:    worktreeCommands,
+		Spice:       spiceCommands,
 		Version:     version,
 		Loaders: Loaders{
 			BranchLoader:       branchLoader,
@@ -178,6 +183,7 @@ func NewGitCommandAux(
 			Worktrees:          worktreeLoader,
 			StashLoader:        stashLoader,
 			TagLoader:          tagLoader,
+			SpiceStackLoader:   spiceStackLoader,
 		},
 		RepoPaths: repoPaths,
 	}