Doc: Describe actions in Uncommitted Changes Found dialog

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 <aha_1980@gmx.de>
This commit is contained in:
Leena Miettinen
2025-05-20 15:38:14 +02:00
parent ec7ae0a6b2
commit af52ccf7a2
3 changed files with 35 additions and 1 deletions

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

@@ -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