Git mergetool 命令

更新时间: 2019-07-13 17:17

git-mergetool - Run merge conflict resolution tools to resolve merge conflicts

语法

git mergetool [--tool=<tool>] [-y | --[no-]prompt] [<file>...]

参数

-t <tool>, --tool=<tool>
    Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and
    tortoisemerge. Run git mergetool --tool-help for the list of valid <tool> settings.

    If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
    variable merge.tool is not set, git mergetool will pick a suitable default.

    You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you
    can configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available
    in PATH.

    Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by
    specifying the command line to invoke in a configuration variable mergetool.<tool>.cmd.

    When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
    configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
    available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
    name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the
    merge tool should write the result of the merge resolution.

    If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
    mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
    resolution after the custom tool has exited.

--tool-help
    Print a list of merge tools that may be used with --tool.

-y, --no-prompt
    Don't prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is
    explicitly specified with the --tool option or with the merge.tool configuration variable.

--prompt
    Prompt before each invocation of the merge resolution program to give the user a chance to skip the path.

-O<orderfile>
    Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the
    diff.orderFile configuration variable (see git-config(1)). To cancel diff.orderFile, use -O/dev/null.

查看更多 git mergetool 命令的使用方法,可以使用命令:

git help mergetool
浅薄

浅薄

[美]尼古拉斯·卡尔 / 刘纯毅 / 中信出版社 / 2015-11 / 49.00 元

互联网时代的飞速发展带来了各行各业效率的提升和生活的便利,但卡尔指出,当我们每天在翻看手机上的社交平台,阅读那些看似有趣和有深度的文章时,在我们尽情享受互联网慷慨施舍的过程中,我们正在渐渐丧失深度阅读和深度思考的能力。 互联网鼓励我们蜻蜓点水般地从多种信息来源中广泛采集碎片化的信息,其伦理规范就是工业主义,这是一套速度至上、效率至上的伦理,也是一套产量最优化、消费最优化的伦理——如此说来,互......一起来看看 《浅薄》 这本书的介绍吧!

HTML 压缩/解压工具

HTML 压缩/解压工具

在线压缩/解压 HTML 代码

CSS 压缩/解压工具

CSS 压缩/解压工具

在线压缩/解压 CSS 代码

HEX CMYK 转换工具

HEX CMYK 转换工具

HEX CMYK 互转工具