Skip to content
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.

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

Uses VSCode as core.editor for rebase #2085

Merged
merged 1 commit into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- When a stash is applied or popped and the Source Control input is empty, we will now update the Source Control input to the stash message
- When stashing changes and the Source Control input is not empty, we will now default the stash message input to the Source Control input value

### Changed

- Uses VSCode as `core.editor` in rebase — closes [#2084](https://github.com/gitkraken/vscode-gitlens/issues/2084)

### Fixed

- Fixes [#2082](https://github.com/gitkraken/vscode-gitlens/issues/2082) - GitLens Home view unreadable in certain themes
Expand Down
2 changes: 1 addition & 1 deletion src/commands/git/rebase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class RebaseGitCommand extends QuickCommand<State> {
break;
}

configs = ['-c', `sequence.editor="${editor}"`];
configs = ['-c', `sequence.editor="${editor}"`, '-c', `core.editor="${editor}"`];
}
return state.repo.rebase(configs, ...state.flags, state.reference.ref);
}
Expand Down