Skip to content

Commit ddf816f

Browse files
committed
Closes #2959 autosquash commits in interactive rebases
1 parent 1e2327b commit ddf816f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/commands/git/rebase.ts

Lines changed: 3 additions & 3 deletions
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)