大网数据广告活动
Linux 与通用命令

git-mergetool · 常用命令示例

· 52CE 我爱测

Run merge conflict resolution tools to resolve merge conflicts. > More information: <https://git-scm.com/docs/git-mergetool>.

git mergetool

Run merge conflict resolution tools to resolve merge conflicts. More information: https://git-scm.com/docs/git-mergetool.

  • Launch the default merge tool to resolve conflicts:

git mergetool

  • List valid merge tools:

git mergetool --tool-help

  • Launch the merge tool identified by a name:

git mergetool

  • Don't prompt before each invocation of the merge tool:

git mergetool

  • Explicitly use the GUI merge tool (see the merge.guitool configuration variable):

git mergetool

  • Explicitly use the regular merge tool (see the merge.tool configuration variable):

git mergetool --no-gui

来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。

资料来源与适用范围

资料来源
tldr-pages contributors
适用范围
请按文中版本与环境说明核对
内容语言
中文;命令、路径和错误标识保留技术原文
本地收录日期
2026-11-15
授权说明
CC BY 4.0

正文与所需资源由本站本地存储。查看来源及更新记录 ↗

请按适用版本和实际日志确认原因;本站没有对每一种系统或设备逐项执行文中的操作。