back to context overview

git-mergetool

List of commands for git-mergetool:

- git
git-mergetool:tldr:02448 git-mergetool: Launch the default merge tool to resolve conflicts.

$ git mergetool

try on your machine

explain this command
- git
git-mergetool:tldr:29c6a git-mergetool: Launch the merge tool identified by a name.

$ git mergetool --tool ${tool_name}

try on your machine

explain this command
- git
git-mergetool:tldr:46fbb git-mergetool: Don't prompt before each invocation of the merge tool.

$ git mergetool --no-prompt

try on your machine

explain this command
- git
git-mergetool:tldr:54156 git-mergetool: Explicitly use the GUI merge tool (see the `merge.guitool` config variable).

$ git mergetool --gui

try on your machine

explain this command
- git
git-mergetool:tldr:5dad4 git-mergetool: List valid merge tools.

$ git mergetool --tool-help

try on your machine

explain this command
- git
git-mergetool:tldr:cee73 git-mergetool: Explicitly use the regular merge tool (see the `merge.tool` config variable).

$ git mergetool --no-gui

try on your machine

explain this command

back to context overview