Doc: Describe reverting changes from annotation view

...when instant blame is enabled.

Task-number: QTCREATORBUG-32575
Change-Id: I96b492ccae14cabda874ac945816e235cf5a5457

Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Leena Miettinen
2025-05-20 11:16:29 +02:00
parent 2b1efd5c03
commit 398c38e999
3 changed files with 17 additions and 5 deletions

View File

@@ -190,6 +190,7 @@ Version Control Systems
([QTCREATORBUG-32361](https://bugreports.qt.io/browse/QTCREATORBUG-32361))
([Documentation](https://doc-snapshots.qt.io/qtcreator-17.0/creator-how-to-git-diff.html))
* Added `Revert` to the actions in the `Instant Blame` tooltip
([Documentation](https://doc-snapshots.qt.io/qtcreator-17.0/creator-how-to-git-reset.html))
* Added the option to create annotated tags to the `Create Branch` dialog
* Added a `Diff & Cancel` option to the `Uncommitted Changes Found` dialog
([QTCREATORBUG-25795](https://bugreports.qt.io/browse/QTCREATORBUG-25795))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -501,7 +501,8 @@
\title git blame
By default, each line is annotated in the editor when you move the cursor
through a file. Hover over the annotation to view commit details.
through a file. Hover over the annotation to view commit details and to apply
actions to the commit.
\image {qtcreator-git-instant-blame.webp} {Instant blame in the code editor}
\caption Instant blame in the code editor
@@ -616,11 +617,11 @@
the next commit. Git allows you to revert back to the state of the last
commit as well as to the state staged in the index.
\section1 Revert changes in the current file
\section1 Reset all uncommitted changes in the current file
To revert all changes and reset the current file to the state of the index,
go to \uicontrol Tools > \uicontrol Git > \uicontrol {Current File} and
select \uicontrol {Undo Unstaged Changes for <file>}.
To undo all unstaged changes and reset the current file to the state of the
index, go to \uicontrol Tools > \uicontrol Git > \uicontrol {Current File}
and select \uicontrol {Undo Unstaged Changes for <file>}.
To return the current file to the state it was in right after the last
commit, select \uicontrol {Undo Uncommitted Changes for <file>}. This reverts
@@ -650,6 +651,16 @@
To recover removed files, select \uicontrol {Recover Deleted Files}.
\section1 Revert commits in the editor
To revert the commit you are currently hovering over, select
\uicontrol {Revert <hash>} in the annotation view.
\image {qtcreator-git-instant-blame.webp} {Instant blame in the code editor}
\caption Actions in the annotation view for instant blame
You are asked to confirm the reversion.
\if defined(qtcreator)
\sa {Use Git}{How To: Use Git}, {Git}
\endif