diff options
author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-07-27 16:34:20 +0200 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-07-27 14:51:00 +0000 |
commit | bce5aca625919687535d2355ede192ac5c0ae0c0 (patch) | |
tree | 4a2efdc0ce13db13390164706328472ffdace7c8 /doc | |
parent | 2ab466ea046e065ec978358cc7b4435d9147cbce (diff) | |
download | qt-creator-bce5aca625919687535d2355ede192ac5c0ae0c0.tar.gz |
Doc: Update Git docs
- Fix paths to functions
- Describe Reset button in Branches dialog
- Update screenshot
Change-Id: I873921a8ee0d4ec6e3572be01e5c59e51adb7a0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/images/qtcreator-vcs-gitbranch.png | bin | 33156 -> 14795 bytes | |||
-rw-r--r-- | doc/src/howto/creator-vcs.qdoc | 9 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/images/qtcreator-vcs-gitbranch.png Binary files differindex beb0a9e8ba..26b3a3992a 100644 --- a/doc/images/qtcreator-vcs-gitbranch.png +++ b/doc/images/qtcreator-vcs-gitbranch.png diff --git a/doc/src/howto/creator-vcs.qdoc b/doc/src/howto/creator-vcs.qdoc index 30f26e26a1..0967170356 100644 --- a/doc/src/howto/creator-vcs.qdoc +++ b/doc/src/howto/creator-vcs.qdoc @@ -481,7 +481,8 @@ \section4 Working with Branches - To work with Git branches, select \uicontrol{Branches}. The checked out branch + To work with Git branches, select \uicontrol Tools > \uicontrol Git > + \uicontrol {Local Repository} > \uicontrol {Branches}. The checked out branch is shown in bold and underlined in the list of branches. Double-click branch names to edit them. @@ -529,6 +530,9 @@ \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. \row @@ -540,7 +544,8 @@ Patches are rewriting instructions that can be applied to a set of files. To apply a patch file that is open in \QC, select \uicontrol Tools > \uicontrol Git > - \uicontrol {Local Repository} > \uicontrol {Apply from Editor}. + \uicontrol {Local Repository} > \uicontrol Patch > + \uicontrol {Apply from Editor}. To select the patch file to apply from the file system, select \uicontrol {Apply from File}. |