From abe7321cb7268bafb5a125e74b4590c1d4b98c93 Mon Sep 17 00:00:00 2001
From: Gabriel Seltzer <gabeseltzer@gmail.com>
Date: Wed, 26 Feb 2025 18:23:47 +0000
Subject: [PATCH] Closes #2959 autosquash commits in interactive rebases

add contributor
---
 CHANGELOG.md               | 1 +
 README.md                  | 1 +
 src/commands/git/rebase.ts | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69f6b83973d28..24ce65996f167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Added
 
+- Adds auto-squashing of fixup commits to interactive rebases ([#2949](https://github.com/gitkraken/vscode-gitlens/issues/2959)) — thanks to [PR #4109](https://github.com/gitkraken/vscode-gitlens/pull/4109) by Gabriel Seltzer [@gabeseltzer](https://github.com/gabeseltzer)
 - Adds AI model status and model switcher to the _Home_ view ([#4064](https://github.com/gitkraken/vscode-gitlens/issues/4064))
 - Adds Anthropic Claude 3.7 Sonnet model for GitLens' AI features ([#4101](https://github.com/gitkraken/vscode-gitlens/issues/4101))
 - Adds Google Gemini 2.0 Flash-Lite model for GitLens' AI features ([#4104](https://github.com/gitkraken/vscode-gitlens/issues/4104))
diff --git a/README.md b/README.md
index b58cd575f9a6d..492f5b7538c41 100644
--- a/README.md
+++ b/README.md
@@ -435,6 +435,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - Jean Pierre ([@jeanp413](https://github.com/jeanp413)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jeanp413)
 - Dawn Hwang ([@hwangh95](https://github.com/hwangh95)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=hwangh95)
 - Emmanuel Ferdman ([@emmanuel-ferdman](https://github.com/emmanuel-ferdman)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=emmanuel-ferdman)
+- Gabriel Seltzer ([@gabeseltzer](https://github.com/gabeseltzer)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gabeseltzer)
 
 Also special thanks to the people that have provided support, testing, brainstorming, etc:
 
diff --git a/src/commands/git/rebase.ts b/src/commands/git/rebase.ts
index e3894b6a54ad3..8da1c00baf337 100644
--- a/src/commands/git/rebase.ts
+++ b/src/commands/git/rebase.ts
@@ -40,7 +40,7 @@ interface Context {
 	title: string;
 }
 
-type Flags = '--interactive';
+type Flags = '--interactive' | '--autosquash';
 
 interface State {
 	repo: string | Repository;
@@ -253,14 +253,14 @@ export class RebaseGitCommand extends QuickCommand<State> {
 		}
 
 		const items: FlagsQuickPickItem<Flags>[] = [
-			createFlagsQuickPickItem<Flags>(state.flags, ['--interactive'], {
+			createFlagsQuickPickItem<Flags>(state.flags, ['--interactive', '--autosquash'], {
 				label: `Interactive ${this.title}`,
 				description: '--interactive',
 				detail: `Will interactively update ${getReferenceLabel(context.branch, {
 					label: false,
 				})} by applying ${pluralize('commit', ahead)} on top of ${getReferenceLabel(state.destination, {
 					label: false,
-				})}`,
+				})} and auto-squash any fixup commits`,
 				picked: behind === 0,
 			}),
 		];