Eric Amodio 2 лет назад
Родитель
Сommit
5afac86f27
2 измененных файлов: 2 добавлений и 1 удалений
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      src/commands/git/rebase.ts

+ 1
- 0
CHANGELOG.md Просмотреть файл

@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Fixed
- Fixes [#2052](https://github.com/gitkraken/vscode-gitlens/issues/2052) - Interactive Rebase fails to start when using xonsh shell due to command quoting
- Fixes [#2141](https://github.com/gitkraken/vscode-gitlens/issues/2141) - GitLens's rebase UI randomly fails loading interactive rebase when performed outside of VSC
- Fixes [#1732](https://github.com/gitkraken/vscode-gitlens/issues/1732) - Phantom rebase-merge directory (`rm -rf ".git/rebase-merge"`)
- Fixes [#1652](https://github.com/gitkraken/vscode-gitlens/issues/1652) - Closing interacteractive rebase editor after "git rebase --edit" aborts rebase-in-progress

+ 1
- 1
src/commands/git/rebase.ts Просмотреть файл

@ -101,7 +101,7 @@ export class RebaseGitCommand extends QuickCommand {
break;
}
configs = ['-c', `sequence.editor="${editor}"`, '-c', `core.editor="${editor}"`];
configs = ['-c', `"sequence.editor=${editor}"`, '-c', `"core.editor=${editor}"`];
}
return state.repo.rebase(configs, ...state.flags, state.reference.ref);
}

Загрузка…
Отмена
Сохранить