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

Doc: Describe additional reset types in Git Branches view

Browse Source 
In addition to a hard reset, users can now choose a soft or
mixed one.

Change-Id: I11d27e335cb3c0f34ae9a6ddf81b7b8ae1948629
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2019-07-09 13:22:36 +02:00
parent 2e3c5c870f
commit afc53cd54d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/vcs/creator-vcs-git.qdoc
View File

@@ -263,7 +263,10 @@
\li Show the changes in a branch.
\row
\li \uicontrol Reset
\li Hard reset the active branch to the selected branch.
\li Reset the active branch to the selected branch. You
can choose between a \uicontrol Hard, \uicontrol Mixed,
and \uicontrol Soft reset. For more information, see
\l{Resetting Local Repository}.
\row
\li \uicontrol Merge
\li Join the development histories in two branches together.