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.

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

Add "no-commit" option to merge dialog #248

Closed
mfmayer opened this issue Jan 16, 2020 · 4 comments
Closed

Add "no-commit" option to merge dialog #248

mfmayer opened this issue Jan 16, 2020 · 4 comments
Assignees
Labels
improvement An improvement to existing functionality
Milestone

Comments

@mfmayer
Copy link

mfmayer commented Jan 16, 2020

When doing "Merge into current branch..." add the option to do the merge without automatically creating the commit (--no-commit option in git merge).

This could look like this:
image

@mfmayer mfmayer added the improvement An improvement to existing functionality label Jan 16, 2020
@mhutchie
Copy link
Owner

Thanks for raising this feature request, this option would definitely be nice to have!

I'll include it in the next release (a beta release with it should be available in the next 1-2 days).

@mhutchie mhutchie added this to the v1.22.0 milestone Jan 16, 2020
@mhutchie
Copy link
Owner

This will be available in v1.22.0.

If you'd like to use it before the next release, you can download v1.22.0-beta.0, and install it following the instructions provided here.

@mfmayer
Copy link
Author

mfmayer commented Jan 20, 2020

Thanks 👍 Definitely one of my favorite vscode plugins

@ModalityZ
Copy link

I'm on a much later version (see below) but there is no dialog for merge options at all when I select Source Control / Branch / "Merge...". I merely get to choose which branch to merge from (via the autocomplete box otherwise used for Ctrl+Shift+p)

Version: 1.88.0
Commit: 5c3e652f63e798a5ac2f31ffd0d863669328dc4c
Date: 2024-04-03T13:25:57.039Z
Electron: 28.2.8
ElectronBuildId: 27744544
Chromium: 120.0.6099.291
Node.js: 18.18.2
V8: 12.0.267.19-electron.0
OS: Linux x64 6.5.0-27-generic snap

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement An improvement to existing functionality
Projects
None yet
Development

No branches or pull requests

3 participants