forked from qt-creator/qt-creator
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:
1
dist/changelog/changes-17.0.0.md
vendored
1
dist/changelog/changes-17.0.0.md
vendored
@@ -190,6 +190,7 @@ Version Control Systems
|
|||||||
([QTCREATORBUG-32361](https://bugreports.qt.io/browse/QTCREATORBUG-32361))
|
([QTCREATORBUG-32361](https://bugreports.qt.io/browse/QTCREATORBUG-32361))
|
||||||
([Documentation](https://doc-snapshots.qt.io/qtcreator-17.0/creator-how-to-git-diff.html))
|
([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
|
* 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 the option to create annotated tags to the `Create Branch` dialog
|
||||||
* Added a `Diff & Cancel` option to the `Uncommitted Changes Found` dialog
|
* Added a `Diff & Cancel` option to the `Uncommitted Changes Found` dialog
|
||||||
([QTCREATORBUG-25795](https://bugreports.qt.io/browse/QTCREATORBUG-25795))
|
([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 |
@@ -501,7 +501,8 @@
|
|||||||
\title git blame
|
\title git blame
|
||||||
|
|
||||||
By default, each line is annotated in the editor when you move the cursor
|
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}
|
\image {qtcreator-git-instant-blame.webp} {Instant blame in the code editor}
|
||||||
\caption 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
|
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.
|
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,
|
To undo all unstaged changes and reset the current file to the state of the
|
||||||
go to \uicontrol Tools > \uicontrol Git > \uicontrol {Current File} and
|
index, go to \uicontrol Tools > \uicontrol Git > \uicontrol {Current File}
|
||||||
select \uicontrol {Undo Unstaged Changes for <file>}.
|
and select \uicontrol {Undo Unstaged Changes for <file>}.
|
||||||
|
|
||||||
To return the current file to the state it was in right after the last
|
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
|
commit, select \uicontrol {Undo Uncommitted Changes for <file>}. This reverts
|
||||||
@@ -650,6 +651,16 @@
|
|||||||
|
|
||||||
To recover removed files, select \uicontrol {Recover Deleted Files}.
|
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)
|
\if defined(qtcreator)
|
||||||
\sa {Use Git}{How To: Use Git}, {Git}
|
\sa {Use Git}{How To: Use Git}, {Git}
|
||||||
\endif
|
\endif
|
||||||
|
Reference in New Issue
Block a user