Unix/Linux Go Back    

Linux 2.6 - man page for git-mergetool--lib (linux section 1)

Linux & Unix Commands - Search Man Pages
Man Page or Keyword Search:   man
Select Man Page Set:       apropos Keyword Search (sections above)

GIT-MERGETOOL--LI(1)			    Git Manual			     GIT-MERGETOOL--LI(1)

       git-mergetool--lib - Common Git merge tool shell scriptlets

       TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"

       This is not a command the end user would want to run. Ever. This documentation is meant
       for people who are studying the Porcelain-ish scripts and/or are writing new ones.

       The git-mergetool--lib scriptlet is designed to be sourced (using .) by other shell
       scripts to set up functions for working with Git merge tools.

       Before sourcing git-mergetool--lib, your script must set TOOL_MODE to define the operation
       mode for the functions listed below. diff and merge are valid values.

	   returns a merge tool.

	   returns the custom command for a merge tool.

	   returns the custom path for a merge tool.

	   launches a merge tool given the tool name and a true/false flag to indicate whether a
	   merge base is present.  $MERGED, $LOCAL, $REMOTE, and $BASE must be defined for use by
	   the merge tool.

       Part of the git(1) suite

Git				    01/14/2014			     GIT-MERGETOOL--LI(1)
Unix & Linux Commands & Man Pages : ©2000 - 2018 Unix and Linux Forums

All times are GMT -4. The time now is 01:35 PM.