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


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


   Use git mergetool to run one of several merge utilities to resolve
   merge conflicts. It is typically run after git merge.

   If one or more <file> parameters are given, the merge tool program will
   be run to resolve differences on each file (skipping those without
   conflicts). Specifying a directory will include all unresolved files in
   that path. If no <file> names are specified, git mergetool will run the
   merge tool program on every file with merge conflicts.


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

       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

       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

       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.

       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 before each invocation of the merge resolution program to
       give the user a chance to skip the path.


   git mergetool creates *.orig backup files while resolving merges. These
   are safe to remove once a file has been merged and its git mergetool
   session has completed.

   Setting the mergetool.keepBackup configuration variable to false causes
   git mergetool to automatically remove the backup as files are
   successfully merged.


   Part of the git(1) suite


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.


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.