From e184d1e4aa7c7cea94381ac3f4a4f6530a60f30c Mon Sep 17 00:00:00 2001 From: Nafiur Rahman Khadem Date: Thu, 14 Jul 2022 00:18:57 +0600 Subject: [PATCH] Uses VSCode as core.editor for rebase --- CHANGELOG.md | 4 ++++ src/commands/git/rebase.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44b3645c50f68..135fcafbcdaa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/commands/git/rebase.ts b/src/commands/git/rebase.ts index a38987d172208..e48148ba186ce 100644 --- a/src/commands/git/rebase.ts +++ b/src/commands/git/rebase.ts @@ -96,7 +96,7 @@ export class RebaseGitCommand extends QuickCommand { 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); }