Skip to content
/ vscode-gitlens Public
  • Notifications You must be signed in to change notification settings
  • Fork 1.2k
  • Star 8.8k
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

Add a --no-commit option to merge command in the Git Command Palette #1178

Closed
eamodio opened this issue Nov 19, 2020 · 9 comments
Closed

Add a --no-commit option to merge command in the Git Command Palette #1178

eamodio opened this issue Nov 19, 2020 · 9 comments
Assignees
@eamodio
Labels
feature New feature or request good first issue Good for newcomers help wanted Want community input and/or pull request verified ✔ Verified
Milestone
Shipped

Comments

@eamodio
Copy link
Member

eamodio commented Nov 19, 2020

No description provided.

@eamodio eamodio added type: potential bug feature New feature or request good first issue Good for newcomers help wanted Want community input and/or pull request and removed type: potential bug labels Nov 19, 2020
@eamodio eamodio mentioned this issue Nov 19, 2020
Git - disable autocommit after (unconflicted) merge microsoft/vscode#110850
Closed
@eamodio
Copy link
Member Author

eamodio commented Nov 19, 2020

https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---no-commit

@GoluffyxD
Copy link

GoluffyxD commented Nov 25, 2020

Hey can I work on this issue?

@eamodio
Copy link
Member Author

eamodio commented Nov 25, 2020

@GoluffyxD please do!

@eamodio eamodio added this to the Backlog milestone Dec 23, 2020
@MatthewS2077
Copy link

MatthewS2077 commented May 2, 2021

Thanks for GitLens! 👍

This would be a great option! 🤞

Is it easy to add a --no-commit option to the GitLens settings?

By default I never want to automatically commit after a non-conflicting merge.

dimaulupov added a commit to dimaulupov/vscode-gitlens that referenced this issue Sep 1, 2021
@dimaulupov
Fixes gitkraken#1178 : adds '--no-ff --no-commit' option to merge
5a7aeac
@dimaulupov dimaulupov mentioned this issue Sep 1, 2021
Fixes #1178: adds '--no-ff --no-commit' option to merge #1621
Merged
7 tasks
@eamodio
Copy link
Member Author

eamodio commented Nov 3, 2021

@GoluffyxD, @MatthewS2077, and others.

Do you just want a --no-commit option or a combined --no-ff --no-commit option like @dimaulupov's PR. Trying to gauge interest and understand use-cases.

@eamodio eamodio modified the milestones: Backlog, Soon™ Nov 3, 2021
@eamodio eamodio self-assigned this Nov 3, 2021
@eamodio eamodio closed this as completed in c5df559 Nov 17, 2021
@eamodio
Copy link
Member Author

eamodio commented Nov 17, 2021

Can you please verify this fix in tomorrow's GitLens insiders edition?

You can install the GitLens insiders edition from here.

Please be sure to disable or uninstall the stable version of GitLens first.

@eamodio eamodio added needs-verification Request for community verification pending-release Resolved but not yet released to the stable edition labels Nov 17, 2021
@dimaulupov
Copy link
Contributor

dimaulupov commented Nov 17, 2021

@eamodio Works great, just tested!
Thank you very much! 🎉

@eamodio
Copy link
Member Author

eamodio commented Nov 17, 2021

Thank you! 🙏

@eamodio eamodio added verified ✔ Verified and removed needs-verification Request for community verification pending-release Resolved but not yet released to the stable edition labels Nov 17, 2021
@eamodio eamodio modified the milestones: Soon™, Shipped Nov 19, 2021
@github-actions
Copy link

github-actions bot commented Dec 20, 2021

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@eamodio eamodio

Labels
feature New feature or request good first issue Good for newcomers help wanted Want community input and/or pull request verified ✔ Verified
Projects
None yet
Milestone
Shipped
Development

No branches or pull requests
4 participants
@dimaulupov @eamodio @MatthewS2077 @GoluffyxD

Footer

© 2024 GitHub, Inc.

装修网纯中式装修图片好的装饰装修公司常德建筑装修公司春节小装饰简笔画楼顶装饰效果图大全马鞍山名流装饰简装精装豪装粉色装修效果图7080装修风格室内装饰装潢公司天启装饰齐齐哈尔众寻装饰怎么样恒大装饰公司怎么样滨州整体厨房装修报价简装 搭配装修室内装饰公司本溪装修装饰别墅结构加固装修简装100平米房子多少钱成都十大装修平装精装宜宾久宜装修公司武汉尚层装饰怎么样博罗装饰公司整体家装如何杭州公装公司狼人杀装饰全包装修多少钱一平方米吉家精装98平米装修费用香港通过《维护国家安全条例》两大学生合买彩票中奖一人不认账让美丽中国“从细节出发”19岁小伙救下5人后溺亡 多方发声汪小菲曝离婚始末卫健委通报少年有偿捐血浆16次猝死单亲妈妈陷入热恋 14岁儿子报警雅江山火三名扑火人员牺牲系谣言手机成瘾是影响睡眠质量重要因素男子被猫抓伤后确诊“猫抓病”中国拥有亿元资产的家庭达13.3万户高校汽车撞人致3死16伤 司机系学生315晚会后胖东来又人满为患了男孩8年未见母亲被告知被遗忘张家界的山上“长”满了韩国人？倪萍分享减重40斤方法许家印被限制高消费网友洛杉矶偶遇贾玲何赛飞追着代拍打小米汽车超级工厂正式揭幕男子被流浪猫绊倒 投喂者赔24万沉迷短剧的人就像掉进了杀猪盘特朗普无法缴纳4.54亿美元罚金周杰伦一审败诉网易杨倩无缘巴黎奥运专访95后高颜值猪保姆德国打算提及普京时仅用姓名西双版纳热带植物园回应蜉蝣大爆发七年后宇文玥被薅头发捞上岸房客欠租失踪 房东直发愁“重生之我在北大当嫡校长”校方回应护栏损坏小学生课间坠楼当地回应沈阳致3死车祸车主疑毒驾事业单位女子向同事水杯投不明物质路边卖淀粉肠阿姨主动出示声明书黑马情侣提车了奥巴马现身唐宁街 黑色着装引猜测老人退休金被冒领16年 金额超20万张立群任西安交通大学校长王树国卸任西安交大校长 师生送别西藏招商引资投资者子女可当地高考胖东来员工每周单休无小长假兔狲“狲大娘”因病死亡外国人感慨凌晨的中国很安全恒大被罚41.75亿到底怎么缴考生莫言也上北大硕士复试名单了专家建议不必谈骨泥色变“开封王婆”爆火：促成四五十对测试车高速逃费 小米：已补缴天水麻辣烫把捣辣椒大爷累坏了

装修网 XML地图 TXT地图 虚拟主机 SEO 网站制作 网站优化