From 6c416ef634f61d811b77e2c4c9424b63a563f6f2 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Tue, 22 Nov 2022 21:38:11 +0100 Subject: [PATCH] Adding more details about the Git integration (#1214) --- .../ROOT/pages/technical-writing/git-integration.adoc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/users-guide/modules/ROOT/pages/technical-writing/git-integration.adoc b/doc/users-guide/modules/ROOT/pages/technical-writing/git-integration.adoc index 40e8efe0a..6d0744357 100644 --- a/doc/users-guide/modules/ROOT/pages/technical-writing/git-integration.adoc +++ b/doc/users-guide/modules/ROOT/pages/technical-writing/git-integration.adoc @@ -36,11 +36,15 @@ image::technical-writing/intellij-git.png[] . In the menu:Branch[] dropdown, select _HEAD_ to show only the commits of the current branch. . The "`Commit`" tool window shows all local changes that can then be committed. +Open it by click on the tool window or use the shortcut [.windows.linux]#kbd:[Alt+0]# [.macos]#kbd:[⌘+0]#. +Explore the different actions in the toolbar by hovering with the mouse over the different icons. ++ +Double-click on a highlighted file or press [.windows.linux]#kbd:[Ctrl+D]# [.macos]#kbd:[⌘+D]# to show the differences side-by-side. See the IntelliJ documentation on how to https://www.jetbrains.com/help/idea/comparing-file-versions.html[Compare file and folder versions] and https://www.jetbrains.com/help/idea/resolving-conflicts.html[Resolve Conflicts]. === Learning more about Git functionality -See https://www.jetbrains.com/help/idea/using-git-integration.html[the IntelliJ documentation] for details. -Use menu:Help[Learn IDE Features] and choose the next final section "`Git`" to start the tutorial covering Git. +* See the topic on https://www.jetbrains.com/help/idea/using-git-integration.html[Git] and its subchapters in the IntelliJ documentation +* Use menu:Help[Learn IDE Features] and choose the next final section "`Git`" to start the tutorial covering Git. == Further reading