forked from qt-creator/qt-creator
Git: Update documentation for the branches side panel
Change-Id: Iff10716debd4e24382ed52e288d04c2dbdd86b1f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
committed by
André Hartmann
parent
bdc2b4b59f
commit
892db36c26
@@ -222,8 +222,10 @@
|
|||||||
|
|
||||||
To work with Git branches, select \uicontrol {Branches}. The checked out
|
To work with Git branches, select \uicontrol {Branches}. The checked out
|
||||||
branch is shown in bold and underlined in the list of branches in the
|
branch is shown in bold and underlined in the list of branches in the
|
||||||
\uicontrol {Git Branches} sidebar view. Double-click local branch names to
|
\uicontrol {Git Branches} sidebar view.
|
||||||
edit them.
|
|
||||||
|
For local and remote branches, the changes log can be shown by double
|
||||||
|
clicking on the branch name.
|
||||||
|
|
||||||
To refresh the list of branches, click \inlineimage reload_gray.png
|
To refresh the list of branches, click \inlineimage reload_gray.png
|
||||||
(\uicontrol Refresh).
|
(\uicontrol Refresh).
|
||||||
@@ -244,7 +246,7 @@
|
|||||||
\li Remove a local branch. You cannot delete remote branches.
|
\li Remove a local branch. You cannot delete remote branches.
|
||||||
\row
|
\row
|
||||||
\li \uicontrol Rename
|
\li \uicontrol Rename
|
||||||
\li Rename a local branch.
|
\li Rename a local branch. You cannot rename remote branches.
|
||||||
\row
|
\row
|
||||||
\li \uicontrol{Checkout}
|
\li \uicontrol{Checkout}
|
||||||
\li Check out the selected branch and make it current. You can stash
|
\li Check out the selected branch and make it current. You can stash
|
||||||
@@ -281,6 +283,24 @@
|
|||||||
\li Set the current branch to track the selected one.
|
\li Set the current branch to track the selected one.
|
||||||
\endtable
|
\endtable
|
||||||
|
|
||||||
|
The following additional context-menu operations are available for
|
||||||
|
\uicontrol{Remote Branches}. The context-menu can be opened on
|
||||||
|
\uicontrol{Remote Branches} or on a specific remote repository.
|
||||||
|
|
||||||
|
\table
|
||||||
|
\header
|
||||||
|
\li Menu Item
|
||||||
|
\li Description
|
||||||
|
\row
|
||||||
|
\li \uicontrol{Fetch}
|
||||||
|
\li Fetches all the branches and changes information from a
|
||||||
|
specific remote repository, or from all remotes if applied
|
||||||
|
to \uicontrol {Remote Branches}.
|
||||||
|
\row
|
||||||
|
\li \uicontrol{Manage Remotes}
|
||||||
|
\li Opens the \uicontrol Remotes dialog.
|
||||||
|
\endtable
|
||||||
|
|
||||||
\section3 Configuring Merge Tools
|
\section3 Configuring Merge Tools
|
||||||
|
|
||||||
Only graphical merge tools are supported. You can configure the
|
Only graphical merge tools are supported. You can configure the
|
||||||
|
Reference in New Issue
Block a user