From 892db36c2685a9f33ce22ab751bd94c46a6129e3 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 11 Oct 2018 20:52:09 +0200 Subject: [PATCH] Git: Update documentation for the branches side panel Change-Id: Iff10716debd4e24382ed52e288d04c2dbdd86b1f Reviewed-by: Leena Miettinen --- doc/src/vcs/creator-vcs-git.qdoc | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index 54d58e96710..aadc914bf5e 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -222,8 +222,10 @@ 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 - \uicontrol {Git Branches} sidebar view. Double-click local branch names to - edit them. + \uicontrol {Git Branches} sidebar view. + + 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 (\uicontrol Refresh). @@ -244,7 +246,7 @@ \li Remove a local branch. You cannot delete remote branches. \row \li \uicontrol Rename - \li Rename a local branch. + \li Rename a local branch. You cannot rename remote branches. \row \li \uicontrol{Checkout} \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. \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 Only graphical merge tools are supported. You can configure the