Free Knowledge Resources


Linux Manual Pages


Free Software * Books

Source Code

Free Media

Linux

git-difftool(1)


NAME

   git-difftool - Show changes using common diff tools

SYNOPSIS

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

DESCRIPTION

   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).

OPTIONS

   -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
       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.

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

   --[no-]symlinks
       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.

   --[no-]trust-exit-code
       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 used.

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

CONFIG VARIABLES

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

   diff.tool
       The default diff tool to use.

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

   difftool.<tool>.path
       Override the path for the given tool. This is useful in case your
       tool is not in the PATH.

   difftool.<tool>.cmd
       Specify the command to invoke the specified diff tool.

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

   difftool.prompt
       Prompt before each invocation of the diff tool.

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

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

SEE ALSO

   git-diff(1)
       Show changes between commits, commit and working tree, etc

   git-mergetool(1)
       Run merge conflict resolution tools to resolve merge conflicts

   git-config(1)
       Get and set repository or global options

GIT

   Part of the git(1) suite



Opportunity


Personal Opportunity - Free software gives you access to billions of dollars of software at no cost. Use this software for your business, personal use or to develop a profitable skill. Access to source code provides access to a level of capabilities/information that companies protect though copyrights. Open source is a core component of the Internet and it is available to you. Leverage the billions of dollars in resources and capabilities to build a career, establish a business or change the world. The potential is endless for those who understand the opportunity.

Business Opportunity - Goldman Sachs, IBM and countless large corporations are leveraging open source to reduce costs, develop products and increase their bottom lines. Learn what these companies know about open source and how open source can give you the advantage.



Free Software


Free Software provides computer programs and capabilities at no cost but more importantly, it provides the freedom to run, edit, contribute to, and share the software. The importance of free software is a matter of access, not price. Software at no cost is a benefit but ownership rights to the software and source code is far more significant.

Free Office Software - The Libre Office suite provides top desktop productivity tools for free. This includes, a word processor, spreadsheet, presentation engine, drawing and flowcharting, database and math applications. Libre Office is available for Linux or Windows.



Free Books


The Free Books Library is a collection of thousands of the most popular public domain books in an online readable format. The collection includes great classical literature and more recent works where the U.S. copyright has expired. These books are yours to read and use without restrictions.

Source Code - Want to change a program or know how it works? Open Source provides the source code for its programs so that anyone can use, modify or learn how to write those programs themselves. Visit the GNU source code repositories to download the source.



Education


Study at Harvard, Stanford or MIT - Open edX provides free online courses from Harvard, MIT, Columbia, UC Berkeley and other top Universities. Hundreds of courses for almost all major subjects and course levels. Open edx also offers some paid courses and selected certifications.

Linux Manual Pages - A man or manual page is a form of software documentation found on Linux/Unix operating systems. Topics covered include computer programs (including library and system calls), formal standards and conventions, and even abstract concepts.


birds banner