From af52ccf7a2bc2a890d3946c9be8f2f1af57cb1b7 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 20 May 2025 15:38:14 +0200 Subject: [PATCH] Doc: Describe actions in Uncommitted Changes Found dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The dialog opens when users execute git pull with uncommitted changes. Only the Stash option was documented. Task-number: QTCREATORBUG-25795 Task-number: QTCREATORBUG-32575 Change-Id: I97bb9174a72ad432683e87cc09d46aacd91bac89 Reviewed-by: André Hartmann --- dist/changelog/changes-17.0.0.md | 1 + ...creator-git-uncommitted-changes-found.webp | Bin 0 -> 8416 bytes doc/qtcreator/src/vcs/creator-vcs-git.qdoc | 35 +++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 doc/qtcreator/images/qtcreator-git-uncommitted-changes-found.webp 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 0000000000000000000000000000000000000000..ad0620b2e4f6df4802d4db1b3d8087b93aa73150 GIT binary patch literal 8416 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 R{65E?XUiVE=H7X46#)GvOeX*U literal 0 HcmV?d00001 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