diff --git a/doc/images/qtcreator-gerrit-options.png b/doc/images/qtcreator-gerrit-options.png index 21b3825a1de..cf6be7a3280 100644 Binary files a/doc/images/qtcreator-gerrit-options.png and b/doc/images/qtcreator-gerrit-options.png differ diff --git a/doc/images/qtcreator-vcs-diff.png b/doc/images/qtcreator-vcs-diff.png index 6568a22def1..7500b965eb7 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-log.png b/doc/images/qtcreator-vcs-log.png deleted file mode 100644 index a7750c1812d..00000000000 Binary files a/doc/images/qtcreator-vcs-log.png and /dev/null differ diff --git a/doc/images/qtcreator-vcs-pane.png b/doc/images/qtcreator-vcs-pane.png index 3c7e21a040a..62270b796f8 100644 Binary files a/doc/images/qtcreator-vcs-pane.png and b/doc/images/qtcreator-vcs-pane.png differ diff --git a/doc/images/qtcreator-vcs-show.png b/doc/images/qtcreator-vcs-show.png new file mode 100644 index 00000000000..610a0f2de05 Binary files /dev/null and b/doc/images/qtcreator-vcs-show.png differ diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 3246926a93f..30f26e26a1c 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -211,7 +211,7 @@ With Git and Subversion, the diff is displayed side-by-side in a \l{Comparing Files} {diff editor} by default. To use the inline diff view instead, select the - \uicontrol {Switch to Text Diff Editor} option from the toolbar. In the inline + \uicontrol {Switch to Text Diff Editor} (1) 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. @@ -241,13 +241,15 @@ Display the versioning history of a file by selecting \uicontrol{Log} or \uicontrol{Filelog}. Typically, the log output contains the date, the commit message, and a change or revision identifier. Click on the identifier to - display a description of the change including the diff. + display a description of the change including the diff in the + \uicontrol {Git Show} view. + + \image qtcreator-vcs-show.png + Right-clicking on an identifier brings up a context menu that lets you show annotation views of previous versions (see \l{Annotating Files}). With Git you can also choose to cherry-pick or revert a change. - \image qtcreator-vcs-log.png - \section2 Annotating Files Annotation views are obtained by selecting \uicontrol{Annotate} or \uicontrol{Blame}.