OnWorks favicon

git-difftool - Online in the Cloud

Run git-difftool in OnWorks free hosting provider over Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

This is the command git-difftool that can be run in the OnWorks free hosting provider using one of our multiple free online workstations such as Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator



git-difftool - Show changes using common diff tools


git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]


git difftool is a Git command that allows you to compare and edit files between revisions
using common diff tools. git difftool is a frontend to git diff and accepts the same
options and arguments. See git-diff(1).


-d, --dir-diff
Copy the modified files to a temporary location and perform a directory diff on them.
This mode never prompts before launching the diff tool.

-y, --no-prompt
Do not prompt before launching a diff tool.

Prompt before each invocation of the diff tool. This is the default behaviour; the
option is provided to override any configuration settings.

-t <tool>, --tool=<tool>
Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and
vimdiff. Run git difftool --tool-help for the list of valid <tool> settings.

If a diff tool is not specified, git difftool will use the configuration variable
diff.tool. If the configuration variable diff.tool is not set, git difftool will pick
a suitable default.

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

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

When git difftool is invoked with this tool (either through the -t or --tool option or
the diff.tool configuration variable) the configured command line will be invoked with
the following variables available: $LOCAL is set to the name of the temporary file
containing the contents of the diff pre-image and $REMOTE is set to the name of the
temporary file containing the contents of the diff post-image. $MERGED is the name of
the file which is being compared. $BASE is provided for compatibility with custom
merge tool commands and has the same value as $MERGED.

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

git difftool's default behavior is create symlinks to the working tree when run in
--dir-diff mode and the right-hand side of the comparison yields the same content as
the file in the working tree.

Specifying --no-symlinks instructs git difftool to create copies instead.
--no-symlinks is the default on Windows.

-x <command>, --extcmd=<command>
Specify a custom command for viewing diffs. git-difftool ignores the configured
defaults and runs $command $LOCAL $REMOTE when this option is specified. Additionally,
$BASE is set in the environment.

-g, --gui
When git-difftool is invoked with the -g or --gui option the default diff tool will be
read from the configured diff.guitool variable instead of diff.tool.

git-difftool invokes a diff tool individually on each file. Errors reported by the
diff tool are ignored by default. Use --trust-exit-code to make git-difftool exit when
an invoked diff tool returns a non-zero exit code.

git-difftool will forward the exit code of the invoked tool when --trust-exit-code is

See git-diff(1) for the full list of supported options.


git difftool falls back to git mergetool config variables when the difftool equivalents
have not been defined.

The default diff tool to use.

The default diff tool to use when --gui is specified.

Override the path for the given tool. This is useful in case your tool is not in the

Specify the command to invoke the specified diff tool.

See the --tool=<tool> option above for more details.

Prompt before each invocation of the diff tool.

Exit difftool if the invoked diff tool returns a non-zero exit status.

See the --trust-exit-code option above for more details.

Use git-difftool online using onworks.net services

Free Servers & Workstations

Download Windows & Linux apps

  • 1
    ExpressLuke GSI
    ExpressLuke GSI
    This SourceForge download page was to
    grant users to download my source built
    GSIs, based upon phhusson's great
    work. I build both Android Pie and
    Android 1...
    Download ExpressLuke GSI
  • 2
    PyQt is the Python bindings for
    Digia's Qt cross-platform
    application development framework. It
    supports Python v2 and v3 and Qt v4 and
    Qt v5. PyQt is avail...
    Download PyQt
  • 3
    Gambas3* coding tools and examples for
    use in SMB or other organizations that
    make internal programs. E.g. from
    database fields to class sourcecode with
    Download garlic3
  • 4
    Sardi is a complete restyling and
    optimisation of svg code. 6 choices for
    your applications and 10 kind of folders
    to use in your file manager. The sardi
    Download Sardi
  • 5
    LMMS Digital Audio Workstation
    LMMS Digital Audio Workstation
    LMMS is a free cross-platform software
    which allows you to produce music with
    your computer. If you like this project
    consider getting involved in the project
    Download LMMS Digital Audio Workstation
  • 6
    FreeRTOS Real Time Kernel (RTOS)
    FreeRTOS Real Time Kernel (RTOS)
    FreeRTOS is a market-leading real-time
    operating system (RTOS) for
    microcontrollers and small
    microprocessors. Distributed freely
    under the MIT open source lice...
    Download FreeRTOS Real Time Kernel (RTOS)
  • 7
    Avogadro is an advanced molecular
    editor designed for cross-platform use
    in computational chemistry, molecular
    modeling, bioinformatics, materials
    science and ...
    Download Avogadro
  • More »

Linux commands

  • 1
    abidiff - compare ABIs of ELF files
    abidiff compares the Application Binary
    Interfaces (ABI) of two shared libraries
    in ELF format. It emits a meaningful
    Run abidiff
  • 2
    abidw - serialize the ABI of an ELF
    file abidw reads a shared library in ELF
    format and emits an XML representation
    of its ABI to standard output. The
    emitted ...
    Run abidw
  • 3
    cppo - lightweight cpp-like
    preprocessor for OCaml ...
    Run cppo
  • 4
    cppunit-config - script to get
    information about the installed version
    of cppunit ...
    Run cppunit-config
  • 5
    fwb_ipt - Policy compiler for Cisco IOS
    ACL ...
    Run fwb_iosacl
  • 6
    fwb_ipf - Policy compiler for ipfilter ...
    Run fwb_ipf
  • More »