Skip to content

Fix #114461#151824

Merged
lszomoru merged 2 commits into
microsoft:mainfrom
pingren:fix/git-rebase
Jul 20, 2022
Merged

Fix #114461#151824
lszomoru merged 2 commits into
microsoft:mainfrom
pingren:fix/git-rebase

Conversation

@pingren

@pingren pingren commented Jun 11, 2022

Copy link
Copy Markdown
Contributor

This PR fixes #114461. It should also address microsoft/vscode-remote-release/issues/3682

Before:
CleanShot 2022-06-11 at 17 32 52

After:

Code-OSS-11Jun22_17-07-11.mp4

@programmer04 programmer04 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, please merge it because it fixes a very annoying issue

@lszomoru lszomoru added the git GIT issues label Jul 20, 2022
@lszomoru lszomoru added this to the July 2022 milestone Jul 20, 2022
@lszomoru lszomoru requested a review from joaomoreno July 20, 2022 11:04
@lszomoru lszomoru merged commit 0b2c56e into microsoft:main Jul 20, 2022
@lszomoru

Copy link
Copy Markdown
Member

@pingren, thank you very much for your contribution and apologies that it took so long to get this merged.

@pingren

pingren commented Jul 21, 2022

Copy link
Copy Markdown
Contributor Author

No worries. THANK YOU for reviewing the PR!

@lszomoru

Copy link
Copy Markdown
Member

@pingren, after more testing, I had to opt for using the GIT_EDITOR environment variable to suppress the git editor as that takes precedence over the core.editor configuration.

@github-actions github-actions Bot locked and limited conversation to collaborators Sep 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Polish and fix git rebase --continue experience

4 participants