forked from qt-creator/qt-creator
Doc: Update info about using Git
Update text and screenshots. Task-number: QTCREATORBUG-23364 Change-Id: Id936d35374fca7ababbbfa35fef507d1cc371786 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
BIN
doc/qtcreator/images/qtcreator-git-log.png
Normal file
BIN
doc/qtcreator/images/qtcreator-git-log.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 16 KiB |
@@ -96,18 +96,38 @@
|
||||
|
||||
To display the versioning history of a file, select \uicontrol{Log of}.
|
||||
The log output contains the date, the commit message, and a commit
|
||||
identifier. Click on the commit identifier to display a description
|
||||
of the change including the diff in the \uicontrol {Git Show} view.
|
||||
identifier. Click on the commit identifier to view commit details.
|
||||
|
||||
\image qtcreator-vcs-show.png
|
||||
\image qtcreator-git-log.png "Commit details in Git log"
|
||||
|
||||
Right-clicking on a commit identifier brings up a context menu that lets
|
||||
you apply actions on the commit, such as view annotations or cherry-pick
|
||||
or revert a commit.
|
||||
or revert a commit. For more information, see \l{Working with Branches}.
|
||||
|
||||
To toggle the diff view, select \uicontrol Diff. To use the patience
|
||||
algorithm for calculating the differences, select \uicontrol Patience.
|
||||
To only show text changes, select \uicontrol {Ignore Whitespace}.
|
||||
|
||||
To filter log entries by the text in the commit message or by strings that
|
||||
were added or removed, select \uicontrol Filter.
|
||||
|
||||
To follow only the first parent on merge commits, select
|
||||
\uicontrol {First Parent}.
|
||||
|
||||
To toggle between textual and visual representation of the log, select
|
||||
\uicontrol Graph.
|
||||
|
||||
To show log also for previous names of the file, select \uicontrol Follow.
|
||||
|
||||
Select \inlineimage reload_gray.png
|
||||
(\uicontrol Reload) to rescan the files.
|
||||
|
||||
To display a description of the change including the diff in the
|
||||
\uicontrol {Git Show} view, select \uicontrol {Describe Change} in the
|
||||
context menu.
|
||||
|
||||
\image qtcreator-vcs-show.png "Commit description in Git show"
|
||||
|
||||
\section2 Viewing Annotations
|
||||
|
||||
To view annotations, select \uicontrol{Blame}. The view displays the lines
|
||||
@@ -174,7 +194,9 @@
|
||||
\section2 Viewing Git Status
|
||||
|
||||
To view the status of the repository in the \uicontrol {Version Control}
|
||||
output view, select \uicontrol Status.
|
||||
output pane, select \uicontrol Status. The context menu contains additional
|
||||
actions, such as selecting and clearing all entries in the pane, copying
|
||||
text, and opening files.
|
||||
|
||||
\section2 Committing Changes to Git
|
||||
|
||||
@@ -226,6 +248,13 @@
|
||||
\uicontrol {Interactive Rebase}. You can reorder or discard commits, squash
|
||||
them into a single commit, or edit the commit messages.
|
||||
|
||||
If you already pushed the local changes to a remote, \QC refuses
|
||||
the interactive rebase because the local commits are missing. To
|
||||
start the interactive rebase from the change log, select
|
||||
\uicontrol Branches > \uicontrol Log. Select the change, and then
|
||||
select > \uicontrol {Interactive Rebase from Change} in the context
|
||||
menu.
|
||||
|
||||
\section2 Working with Branches
|
||||
|
||||
To work with Git branches, select \uicontrol {Branches}. The checked out
|
||||
@@ -239,6 +268,10 @@
|
||||
(\uicontrol {Filter Tree}), and then select
|
||||
\uicontrol {Include Old Entries} and \uicontrol {Include Tags}.
|
||||
|
||||
To add a tag to a change in the change log, select \uicontrol Branches >
|
||||
\uicontrol Log. Select the change, and then select > \uicontrol {Add Tag
|
||||
for Change} in the context menu.
|
||||
|
||||
If you checked out a specific commit, the list of branches displays a
|
||||
\e {Detached HEAD} entry.
|
||||
|
||||
@@ -422,6 +455,8 @@
|
||||
to perform a rebase operation while pulling.
|
||||
|
||||
To push committed changes to the remote repository, select \uicontrol Push.
|
||||
If the local branch does not have an upstream branch in the remote
|
||||
repository, \QC prompts you to create it and set it as upstream.
|
||||
|
||||
\section2 Managing Remote Repositories
|
||||
|
||||
|
||||
Reference in New Issue
Block a user