mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00

52 lines

1.4 KiB

Text

Raw Normal View History

Add git-mergetool to run an appropriate merge conflict resolution program The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> 2007-03-06 06:05:16 +01:00			`git-mergetool(1)`
			`================`

			`NAME`
			`----`
			`git-mergetool - Run merge conflict resolution tools to resolve merge conflicts`

			`SYNOPSIS`
			`--------`
			`'git-mergetool' [--tool=<tool>] [<file>]...`

			`DESCRIPTION`
			`-----------`

			`Use 'git mergetool' to run one of several merge utilities to resolve`
			`merge conflicts. It is typically run after gitlink:git-merge[1].`

			`If one or more <file> parameters are given, the merge tool program will`
			`be run to resolve differences on each file. If no <file> names are`
			`specified, 'git mergetool' will run the merge tool program on every file`
			`with merge conflicts.`

			`OPTIONS`
			`-------`
			`-t or --tool=<tool>::`
			`Use the merge resolution program specified by <tool>.`
			`Valid merge tools are:`
mergetool: add support for ECMerge Add support to mergetool for ECMerge available from http://www.elliecomputing.com/Products/merge_overview.asp Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 2007-10-17 19:16:12 +02:00			`kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff`
Fix minor formatting issue in man page for git-mergetool Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> 2007-03-27 17:38:59 +02:00			`+`
			`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 default.`
mergetool: use path to mergetool in config var mergetool.<tool>.path This commit adds a mechanism to provide absolute paths to the external programs called by 'git mergetool'. A path can be specified in the configuation variable mergetool.<tool>.path. The configuration variable is similar to how we name branches and remotes. It is extensible if we need to specify more details about a tool. The mechanism is especially useful on Windows, where external programs are unlikely to be in PATH. [sp: Fixed a few minor issues prior to applying] Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 2007-10-17 19:16:11 +02:00			`+`
			`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.`
Add git-mergetool to run an appropriate merge conflict resolution program The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> 2007-03-06 06:05:16 +01:00
			`Author`
			`------`
			`Written by Theodore Y Ts'o <tytso@mit.edu>`

			`Documentation`
			`--------------`
			`Documentation by Theodore Y Ts'o.`

			`GIT`
			`---`
			`Part of the gitlink:git[7] suite`