diff --git a/dist/changelog/changes-17.0.0.md b/dist/changelog/changes-17.0.0.md index f6d59b95d3c..2f7fedd42a3 100644 --- a/dist/changelog/changes-17.0.0.md +++ b/dist/changelog/changes-17.0.0.md @@ -195,6 +195,7 @@ Version Control Systems ([Documentation](https://doc-snapshots.qt.io/qtcreator-17.0/creator-how-to-git-log.html)) * Added a `Diff & Cancel` option to the `Uncommitted Changes Found` dialog ([QTCREATORBUG-25795](https://bugreports.qt.io/browse/QTCREATORBUG-25795)) + ([Documentation](https://doc-snapshots.qt.io/qtcreator-17.0/creator-how-to-git-pull.html)) * Added a `.gitignore` file when creating a repository in an existing directory ([QTCREATORBUG-29776](https://bugreports.qt.io/browse/QTCREATORBUG-29776)) * Fixed that numbers in file names were interpreted as commit IDs diff --git a/doc/qtcreator/images/qtcreator-git-uncommitted-changes-found.webp b/doc/qtcreator/images/qtcreator-git-uncommitted-changes-found.webp new file mode 100644 index 00000000000..ad0620b2e4f Binary files /dev/null and b/doc/qtcreator/images/qtcreator-git-uncommitted-changes-found.webp differ diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 950ac1bef1f..32f1c94a1f3 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -1223,7 +1223,40 @@ To pull changes from a remote repository, go to \uicontrol Tools > \uicontrol Git > \uicontrol {Remote Repository} and select \uicontrol Pull. - If you have modified files, you are prompted to stash the changes. + If you have modified files, you are asked how to handle them. + + \section1 Manage uncommitted changes + + \image {qtcreator-git-uncommitted-changes-found.webp} {Uncommitted Changes Found dialog} + + You can apply the following actions to uncommitted changes: + + \table + \header + \li Menu Item + \li Description + \row + \li \uicontrol {Diff & Cancel} + \li View a diff of the changes and cancel \c {git pull}. + \row + \li \uicontrol {Discard} + \li Reset local changes and execute \c {git pull}. The changes will + be lost. + \row + \li \uicontrol {Ignore} + \li Execute \c {git pull} with local changes in the working + directory. + \row + \li \uicontrol {Show/Hide Details} + \li Show or hide details of the local changes. + \row + \li \uicontrol {Stash} + \li Stash the local changes and execute \c {git pull}. + \row + \li \uicontrol {Stash & Pop} + \li Stash the local changes, execute \c {git pull}, and then pop + the changes. + \endtable \section1 Pull with rebase