diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2018-10-11 10:12:52 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2018-10-11 08:24:57 +0000 |
| commit | 9e781a1b1958b9979eae7e60a255504255662229 (patch) | |
| tree | 824160cae153f07368aa1abbc940eb3b1cf112c1 /doc | |
| parent | d8768c0c6df0c0a75d3a7b49d6a92d7aa5fcb567 (diff) | |
Doc: Describe configuring merge tools
Qt Creator only supports graphical merge tools
Change-Id: I282613a03ba2ff91e82b4bafe5d95164495231f8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/vcs/creator-vcs-git.qdoc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index f5cd4a2e92..54d58e9671 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -281,6 +281,17 @@ \li Set the current branch to track the selected one. \endtable + \section3 Configuring Merge Tools + + Only graphical merge tools are supported. You can configure the + merge tool to use on the command line. For example, to use the + \l{http://kdiff3.sourceforge.net/}{KDiff3} merge tool, enter the + following command: + + \badcode + git config --global merge.tool kdiff3 + \endcode + \section2 Applying Patches Patches are rewriting instructions that can be applied to a set of files. |