Skip to content

Closes #2959 autosquash commits in interactive rebases #4109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −3
Open

Closes #2959 autosquash commits in interactive rebases #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
- Jean Pierre ([@jeanp413](https://github.com/jeanp413)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jeanp413)
- Dawn Hwang ([@hwangh95](https://github.com/hwangh95)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=hwangh95)
- Emmanuel Ferdman ([@emmanuel-ferdman](https://github.com/emmanuel-ferdman)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=emmanuel-ferdman)
- Gabriel Seltzer ([@gabeseltzer](https://github.com/gabeseltzer)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gabeseltzer)

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

Expand Down
6 changes: 3 additions & 3 deletions src/commands/git/rebase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface Context {
title: string;
}

type Flags = '--interactive';
type Flags = '--interactive' | '--autosquash';

interface State {
repo: string | Repository;
Expand Down Expand Up @@ -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,
}),
];
Expand Down