git-mergetool:tldr:5dad4

The command git mergetool --tool-help is used to display the available merge tools and their configuration options that can be used with git mergetool command.

When conflicts occur during a merge operation in Git, git mergetool is a command that helps with resolving these conflicts by opening a merge tool specified in the Git configuration. This command launches a graphical merge resolution tool that allows users to manually resolve conflicts by editing files or selecting specific changes.

By adding --tool-help flag to the command, Git will not execute any merge tool but instead display a list of available merge tools along with their respective configuration options.

The output of the command typically shows the name of each merge tool, its command, and a brief description. For example, the output might look like this:

git mergetool --tool-help
'git mergetool --tool=<tool>' may be set to one of the following:

        araxis
                Run Araxis Merge in 3-way mode on the file
        bc3
                Beyond Compare 3 conflict resolution
        ...

The list provides the available merge tools that have been configured in Git, allowing users to choose the appropriate tool for resolving merge conflicts in their particular environment. The specific merge tool can be set using the --tool=<tool> option with the git mergetool command.