diff --git a/doc/images/qtcreator-vcs-diff.png b/doc/images/qtcreator-vcs-diff.png index 360e27099742df9602c486fe104208dca9760148..6568a22def17bdda062f504ac614606537efc75a 100644 Binary files a/doc/images/qtcreator-vcs-diff.png and b/doc/images/qtcreator-vcs-diff.png differ diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/images/qtcreator-vcs-gitbranch.png index 26aac18326f16417765f0e9701fe10ee2da5e223..beb0a9e8badf7a7ae647003586559448f782705b 100644 Binary files a/doc/images/qtcreator-vcs-gitbranch.png and b/doc/images/qtcreator-vcs-gitbranch.png differ diff --git a/doc/images/qtcreator-vcs-log.png b/doc/images/qtcreator-vcs-log.png index aa88ff31ed4a1e13dcb2d0f5ca6ac270dcb480b9..a7750c1812d633d778bb2ebc10e027f8ba11f17f 100644 Binary files a/doc/images/qtcreator-vcs-log.png and b/doc/images/qtcreator-vcs-log.png differ diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index e9c2dd96fd486856ed58aff1ebbf02cd93f243c9..4783cd4eeeac400fd3529def778046a6f108e671 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -140,6 +140,11 @@ For example, \c ssh-askpass or \c x11-ssh-askpass, depending on the ssh-askpass implementation that you use. + \li \gui {Patch command} specifies the path to the patch utility that is + used to apply changes in the format used to represent the diff + output. The \gui Revert command uses the patch utility to revert + partial changes. + \endlist \section1 Creating VCS Repositories for New Projects @@ -192,9 +197,10 @@ \image qtcreator-vcs-diff.png With Git, the diff is displayed side-by-side in a \l{Comparing Files} - {diff editor} by default. To use the old diff view instead, select - \gui Tools > \gui Options > \gui {Version Control} > \gui Git, and deselect - the \gui {Show diff side-by-side} option. + {diff editor} by default. To use the inline diff view instead, select the + \gui {Switch to Text Diff Editor} option from the toolbar. In the inline + diff view, you can use context menu commands to apply, revert, stage, and + unstage hunks, as well as send them to a code pasting service. \section2 Viewing Versioning History and Change Details @@ -238,12 +244,13 @@ The \gui{Diff Selected Files} button brings up a diff view of the files selected in the file list. Since the commit page is just another - editor, you can go back to it by closing the diff view. You can also check - a diff view from the editor combo box showing the \gui{Opened files}. + editor, you can go back to it by closing the diff view. You can also switch + to an open diff view by selecting it in the \gui{Open Documents} pane in the + sidebar. \section2 Reverting Changes - All supported version control system support reverting your project to + All supported version control systems support reverting your project to known states. This functionality is generally called \e reverting. The changes discarded depend on the version control system. @@ -445,6 +452,12 @@ \row \li \gui Rebase \li Copy local commits to the updated upstream head. + \row + \li \gui {Cherry Pick} + \li Cherry pick the top commit from the selected branch. + \row + \li \gui Track + \li Set the current branch to track the selected one. \endtable \section4 Applying Patches @@ -568,6 +581,14 @@ \section3 Working with Git Tools + To start a graphical interface to Git, select \gui Tools > \gui Git > + \gui {Git Tools} > \gui {Git Gui}. + + \note On Mac OS X, the default Git installation does not contain Git Gui. To + use Git Gui, install it separately. To start Git Gui from \QC, select + \gui Preferences > \gui {Version Control} > \gui Git, and set the path to + the environment that contains Git Gui in the \gui {Prepend to PATH} field. + To start the commit viewer for Git, select \gui Tools > \gui Git > \gui {Git Tools} > \gui Gitk. You can also start the tool to view commits in the current document or in the folder that contains the current document.