feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Update Git docs

Browse Source 
- Fix paths to functions
- Describe Reset button in Branches dialog
- Update screenshot

Change-Id: I873921a8ee0d4ec6e3572be01e5c59e51adb7a0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2016-07-27 16:34:20 +02:00
parent 2ab466ea04
commit bce5aca625
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/src/howto/creator-vcs.qdoc
View File

@@ -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.
@@ -528,6 +529,9 @@
\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.
@@ -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}.