Doc: Update information about Git Branches sidebar view

This used to be a dialog. Update the screenshot.

Change-Id: I586abab1f68a82de5be99d7a209cc5a0ba8c1df0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

3 files changed, 18 insertions, 12 deletions

diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/images/qtcreator-vcs-gitbranch.png
index 26b3a3992a..b19c0cfeba 100644
--- a/doc/images/qtcreator-vcs-gitbranch.png
+++ b/doc/images/qtcreator-vcs-gitbranch.png
diff --git a/doc/src/howto/creator-sidebar-views.qdocinc b/doc/src/howto/creator-sidebar-views.qdocinc
index a08b04de63..7ba172b3c3 100644
--- a/doc/src/howto/creator-sidebar-views.qdocinc
+++ b/doc/src/howto/creator-sidebar-views.qdocinc
@@ -47,6 +47,9 @@
         \endif
         \li \uicontrol{File System} shows all files in the currently selected
              directory.
+        \li \uicontrol {Git Branches} shows the local and remote brances for the
+            project in the Git version control system. For more information, see
+            \l{Working with Branches}.
         \li \uicontrol Outline shows an overview of defined types and other
             symbols, as well as their properties and hierarchy in a source file.
     \endlist
diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc
index 88fd02b39d..f5cd4a2e92 100644
--- a/doc/src/vcs/creator-vcs-git.qdoc
+++ b/doc/src/vcs/creator-vcs-git.qdoc
@@ -221,21 +221,22 @@
     \section2 Working with Branches
 
     To work with Git branches, select \uicontrol {Branches}. The checked out
-    branch is shown in bold and underlined in the list of branches. Double-click
-    branch names to edit them.
+    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.
 
-    \image qtcreator-vcs-gitbranch.png "Branches dialog"
+    To refresh the list of branches, click \inlineimage reload_gray.png
+    (\uicontrol Refresh).
 
-    The following operations are supported:
+    \image qtcreator-vcs-gitbranch.png "Git Branches sidebar view"
+
+    The following operations are supported in the context-menu for a branch:
 
     \table
         \header
             \li Menu Item
             \li Description
         \row
-            \li \uicontrol{Refresh}
-            \li Refresh the list of branches.
-        \row
             \li \uicontrol{Add}
             \li Create new tracking and non-tracking branches.
         \row
@@ -256,20 +257,22 @@
             \li \uicontrol{Log}
             \li Show the changes in a branch.
         \row
+            \li \uicontrol Reset
+            \li Hard reset the active branch to the selected branch.
+        \row
             \li \uicontrol Merge
             \li Join the development histories in two branches together.
 
                 If the commit you are merging can be reached by following the
                 first commit's history, there is no divergent work to merge
                 together. To allow Git to move the branch pointer forward,
-                select \uicontrol {Fast-Forward}. If you do not want to
-                fast-forward the branch, select \uicontrol {No Fast-Forward}.
+                select \uicontrol {Merge (Fast-Forward)}. If you do not want to
+                fast-forward the branch, select
+                \uicontrol {Merge (No Fast-Forward)}.
         \row
             \li \uicontrol Rebase
             \li Copy local commits to the updated upstream head.
-        \row
-            \li \uicontrol Reset
-            \li Hard reset the active branch to the selected branch.
+
         \row
             \li \uicontrol {Cherry Pick}
             \li Cherry pick the top commit from the selected branch.