Skip to content

Commit ab4767d

Browse files
committed
Closes #2959 autosquash commits in interactive rebases
add contributor
1 parent 1e2327b commit ab4767d

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
88

99
### Added
1010

11+
- 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)
1112
- Adds AI model status and model switcher to the _Home_ view ([#4064](https://github.com/gitkraken/vscode-gitlens/issues/4064))
1213
- Adds Anthropic Claude 3.7 Sonnet model for GitLens' AI features ([#4101](https://github.com/gitkraken/vscode-gitlens/issues/4101))
1314
- Adds Google Gemini 2.0 Flash-Lite model for GitLens' AI features ([#4104](https://github.com/gitkraken/vscode-gitlens/issues/4104))

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
435435
- Jean Pierre ([@jeanp413](https://github.com/jeanp413)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jeanp413)
436436
- Dawn Hwang ([@hwangh95](https://github.com/hwangh95)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=hwangh95)
437437
- Emmanuel Ferdman ([@emmanuel-ferdman](https://github.com/emmanuel-ferdman)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=emmanuel-ferdman)
438+
- Gabriel Seltzer ([@gabeseltzer](https://github.com/gabeseltzer)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gabeseltzer)
438439

439440
Also special thanks to the people that have provided support, testing, brainstorming, etc:
440441

src/commands/git/rebase.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ interface Context {
4040
title: string;
4141
}
4242

43-
type Flags = '--interactive';
43+
type Flags = '--interactive' | '--autosquash';
4444

4545
interface State {
4646
repo: string | Repository;
@@ -253,14 +253,14 @@ export class RebaseGitCommand extends QuickCommand<State> {
253253
}
254254

255255
const items: FlagsQuickPickItem<Flags>[] = [
256-
createFlagsQuickPickItem<Flags>(state.flags, ['--interactive'], {
256+
createFlagsQuickPickItem<Flags>(state.flags, ['--interactive', '--autosquash'], {
257257
label: `Interactive ${this.title}`,
258258
description: '--interactive',
259259
detail: `Will interactively update ${getReferenceLabel(context.branch, {
260260
label: false,
261261
})} by applying ${pluralize('commit', ahead)} on top of ${getReferenceLabel(state.destination, {
262262
label: false,
263-
})}`,
263+
})} and auto-squash any fixup commits`,
264264
picked: behind === 0,
265265
}),
266266
];

0 commit comments

Comments
 (0)