Doc: Update VCS screenshots
...and make related changes in the doc file. Rename qtcreator-vcs-log.png as qtcreator-vcs-show.png, because it is a screenshot of the Git Show view. Change-Id: Ibf5dbb4c72e0d8b743f67307288452a6224de74c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
doc/images/qtcreator-vcs-show.png
Normal file
After Width: | Height: | Size: 35 KiB |
@@ -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}.
|
||||
|