Git Tools
Git Gui
To start a graphical interface to Git, go to Tools > Git > Git Tools > Git Gui.
Note: On macOS, the default Git installation does not have Git Gui. To use Git Gui, install it separately. To start Git Gui from Qt Creator, go to Preferences > Version Control > Git, and set the path to the environment that has Git Gui in Prepend to PATH.
Gitk
To start the commit viewer for Git, go to Tools > Git > Git Tools > Gitk. You can also start the tool to view commits in the current document or in the folder that has the current document. To specify arguments for running Gitk, go to Preferences > Version Control > Git.
Other repository browsers
To use some other application for viewing Git history, such as GitX or QGit viewer:
- Go to Preferences > Version Control > Git.
- In Command, specify the path to the application executable.
To start the application, go to Tools > Git > Git Tools > Repository Browser.
Git Bash
To start Git Bash, go to Tools > Git > Git Tools > Git Bash.
Resolve conflicts in the editor
Open a file with merge conflict markers to see the current, incoming, and, for diff3 conflicts, base sections highlighted in the text editor. Above each conflict, select Choose Current Change, Choose Incoming Change, or Choose Both to resolve it.
The comparison list highlights removed and added characters within the sections. For diff3 conflicts, Base to Incoming is selected by default. Select Base to Current to inspect the local changes instead. Conflicts without a base section use Current to Incoming. The highlights update as you edit the conflict.
Merge tools
To resolve merge conflicts, go to Tools > Git > Git Tools > Merge Tool. This menu item is visible only when you have merge conflicts to resolve.
See also How to: Use Git and Using Git.
Copyright © The Qt Company Ltd. and other contributors. Documentation contributions included herein are the copyrights of their respective owners. The documentation provided herein is licensed under the terms of the GNU Free Documentation License version 1.3 as published by the Free Software Foundation. Qt and respective logos are trademarks of The Qt Company Ltd in Finland and/or other countries worldwide. All other trademarks are property of their respective owners.