From 398c38e9992ce22b29b2cc47eb1b732e101f34ac Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 20 May 2025 11:16:29 +0200 Subject: [PATCH] Doc: Describe reverting changes from annotation view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...when instant blame is enabled. Task-number: QTCREATORBUG-32575 Change-Id: I96b492ccae14cabda874ac945816e235cf5a5457 Reviewed-by: André Hartmann --- dist/changelog/changes-17.0.0.md | 1 + .../images/qtcreator-git-instant-blame.webp | Bin 16010 -> 17894 bytes doc/qtcreator/src/vcs/creator-vcs-git.qdoc | 21 +++++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dist/changelog/changes-17.0.0.md b/dist/changelog/changes-17.0.0.md index b2ca21aebe7..879d71d307d 100644 --- a/dist/changelog/changes-17.0.0.md +++ b/dist/changelog/changes-17.0.0.md @@ -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)) diff --git a/doc/qtcreator/images/qtcreator-git-instant-blame.webp b/doc/qtcreator/images/qtcreator-git-instant-blame.webp index 05dcb286f1296755b326606c570eaa3ca52bc220..d94a46b01913d8fb49b1cab171c3abbef370a167 100644 GIT binary patch literal 17894 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 diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 5283355221b..00f561461b1 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -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 }. + 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 }. To return the current file to the state it was in right after the last commit, select \uicontrol {Undo Uncommitted Changes for }. 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 } 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