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.

Sign up for GitHub

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

Jump to bottom

Fix #114461 #151824

Merged
merged 2 commits into from
Jul 20, 2022
Merged

Fix #114461 #151824

merged 2 commits into from
Jul 20, 2022

Conversation

pingren
Copy link
Contributor

@pingren pingren commented Jun 11, 2022

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 approved these changes Jun 15, 2022
View reviewed changes
Copy link

@programmer04 programmer04 left a comment

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
Member

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

@pingren
Copy link
Contributor Author

pingren commented Jul 21, 2022

No worries. THANK YOU for reviewing the PR!

@lszomoru
Copy link
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.
Reviewers

@joaomoreno joaomoreno joaomoreno approved these changes

@lszomoru lszomoru lszomoru approved these changes

@programmer04 programmer04 programmer04 approved these changes

Assignees

@lszomoru lszomoru

Labels
git GIT issues
Projects
None yet
Milestone
July 2022
Development

Successfully merging this pull request may close these issues.

Polish and fix git rebase --continue experience
4 participants
@pingren @lszomoru @joaomoreno @programmer04