search

gitkraken / vscode-gitlens

Supercharge Git inside VS Code and unlock untapped knowledge within each repository — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more
http://gitkraken.com/gitlens
Other
8.87k stars 1.23k forks source link

Toggle interactive rebase editor without aborting? #1200

Open borekb opened 3 years ago

borekb commented 3 years ago

The new interactive rebase editor is interesting but I need to build confidence in it – as many other people in the previous feedback issue https://github.com/eamodio/vscode-gitlens/issues/1153.

Since 11.0.2, it's possible to disable the new UI via global settings, which aborts the rebase and hides the UI "forever".

Would it be technically possible to implement a switch within a single rebase session? To me, an ideal behavior is that I can freely switch between the two without aborting the rebase.

eamodio commented 3 years ago

Technically you can do this today with the vscode Reopen Editor with command, but the problem is that vscode closes the document and then re-opens it. Which breaks the wait behavior, because once the document is closed git will start the rebase. I'm hoping we can get that fixed in vscode so that this could work properly.

I thought I had an existing issue opened for this, but I've now opened: https://github.com/microsoft/vscode/issues/111187

MetRonnie commented 3 years ago

I think this is implemented in 11.2.1? There's now a "Switch to text" button in the interative rebase UI

eamodio commented 3 years ago

Yeah, the experience is still not what I'd want (that vscode bug needs to be fixed) but the Switch to Text button does provide this feature. It's just more fragile than I would like.