Merge pull request #8345 from MicrosoftDocs/main637956627752348115sync_temp

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

docs/ide/reference/media/vs-2022/tools-options-text-editor-advanced.png

@@ -1,7 +1,7 @@
 ---
 title: Options, Text Editor, Advanced
 description: Learn how to use the Advanced dialog box to change global settings for the Visual Studio text editor.
-ms.date: 06/28/2022
+ms.date: 08/09/2022
 ms.topic: reference
 f1_keywords:
 - VS.ToolsOptionsPages.Text_Editor.Advanced
@@ -53,6 +53,14 @@ Selected by default, this option adds a margin view next to the scrollbar that s
 
 Selected by default, toggle to turn off auto-complete mode.
 
+::: moniker range="vs-2022"
+
+## Click to peek in margin
+
+The **Single click** setting is selected by default. The settings you choose from allow you to customize how Peek Definition works when you use it to display the differences between Git commits. You can change the default **Single click** setting to **Double click**, or you can select **None** to turn off the [Peek Difference UI](../../version-control/git-line-staging.md#peek-difference-support).
+
+::: moniker-end
+
 ## Word Based Suggestions in files handled by TextMate grammars
 
 Visual Studio provides alternate programming language support and colorization in the editor by using [TextMate grammars](https://macromates.com/manual/en/language_grammars). When enabled, the Visual Studio auto-complete functionality is based on words typed rather than code. Toggle to turn off.

docs/ide/reference/options-text-editor-advanced.md

@@ -2,7 +2,7 @@
 title: "What's new in Visual Studio 2022"
 titleSuffix: ""
 description: "Learn about the new features in Visual Studio 2022."
-ms.date: 07/07/2022
+ms.date: 08/09/2022
 helpviewer_keywords:
   - "Visual Studio, what's new"
   - "what's new [Visual Studio]"
@@ -19,7 +19,7 @@ ms.workload:
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
-**Updated for the 17.2 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
+**Updated for the 17.3 release.** See [full release notes](/visualstudio/releases/2022/release-notes) | View [product roadmap](/visualstudio/productinfo/vs-roadmap/)
 
 >[!div class="button"]
 >[Download Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)
@@ -48,6 +48,10 @@ In [Visual Studio 2022](https://devblogs.microsoft.com/visualstudio/visual-studi
 > [!TIP]
 > To learn more about current and upcoming changes to the search experience in Visual Studio 2022, see the [Sneak Peek and Edit Your Code While You Search](https://devblogs.microsoft.com/visualstudio/sneak-peek-and-edit-your-code-while-you-search/) blog post.
 
+### Git tooling is faster
+
+**New in 17.2**: We've integrated a relatively new Git feature called the [commit graph](https://devblogs.microsoft.com/devops/supercharging-the-git-commit-graph/), which helps to improve both the performance of your Git operations and the performance of Visual Studio itself. For the latest info, see the [Supercharge your Git experience in Visual Studio 2022](https://devblogs.microsoft.com/visualstudio/supercharge-your-git-experience-in-vs/) blog post.
+
 ## Build modern apps
 
 Visual Studio 2022 makes it quick and easy to build modern, cloud-based applications with Azure. As well, our new version also has full support for [.NET 6](https://devblogs.microsoft.com/dotnet/announcing-net-6/) and its unified framework for web, client, and mobile apps for both Windows and Mac developers. And, Visual Studio 2022 includes robust support for the C++ workload with new productivity features, C++20 tooling, and [IntelliSense](using-intellisense.md).
@@ -68,12 +72,11 @@ As well, we're updating **Hot Reload** so that you can edit either C++ or .NET p
 
 From real-time & asynchronous collaboration tools to improved insights and productivity tools that seamlessly integrate with your daily workflow, Visual Studio 2022 has this and more.
 
-### Multi-repo support with Git in the IDE
+### Git multi-repo support and line-staging support
 
 If you've worked with projects hosted on different Git repositories, you might have used external tools or multiple instances of Visual Studio to connect to them. In [Visual Studio 2022](https://devblogs.microsoft.com/visualstudio/visual-studio-2022-preview-3-now-available/), you can work with a single solution that has projects in multiple repositories and contribute to them all from a single instance of Visual Studio. To learn more, see the [**Multi-repo support in Visual Studio**](https://devblogs.microsoft.com/visualstudio/multi-repo-support-in-visual-studio/) blog post.
 
-> [!NOTE]
-> **New in 17.2**: We're continuing to add even more functionality to the Git feature set. For the latest info, see the [Supercharge your Git experience in Visual Studio 2022](https://devblogs.microsoft.com/visualstudio/supercharge-your-git-experience-in-vs/) blog post.
+**New in 17.3**: We continue to add even more functionality to the Git feature set. We've recently added line-staging support, also known as [interactive staging](https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging). Now, you can stage chunks of changes in your files right from the code editor, or split changes across different commits. For more information, see the [**Stage lines of code in Visual Studio**](../version-control/git-line-staging.md) page.
 
 ### IntelliCode improvements
 

docs/ide/whats-new-visual-studio-2022.md

@@ -0,0 +1,84 @@
+---
+title: Stage lines of code in Visual Studio
+titleSuffix: ""
+description: Stage multiple lines of code at one time or split changes across different commits by using Git from directly within Visual Studio.
+ms.date: 08/09/2022
+ms.topic: how-to
+author: TerryGLee
+ms.author: tglee
+ms.manager: jmartens
+ms.prod: visual-studio-windows
+ms.technology: vs-ide-general
+ms.custom: version-control
+monikerRange: vs-2022
+---
+# Stage lines of code in Visual Studio
+
+ [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
+
+Line-staging support, also known as [interactive staging](https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging), is now available in Visual Studio 2022 [version 17.3](/visualstudio/releases/2022/release-notes/). Line-staging lets you stage chunks of changes in your files right from the code editor. Line staging can also be helpful when you want to split changes across different commits.
+
+:::image type="content" source="media/vs-2022/git-line-staging.png" alt-text="Screenshot of an example of line-staging support in Visual Studio 2022." lightbox="media/vs-2022/git-line-staging.png":::
+
+## Color margin support
+
+The first thing you might notice about line-staging support is how the editor visualizes Git changes on both the scroll bar and in the margin.
+
+:::image type="content" source="media/vs-2022/git-color-margins.png " alt-text="Screenshot of the color margins in the Visual Studio 2022 editor." lightbox="media/vs-2022/git-color-margins.png":::
+
+The colors and annotations make it easy to differentiate between saved and unsaved changes that you've added, deleted, or modified.
+
+:::image type="content" source="media/vs-2022/git-color-margins-differentiated.png " alt-text="Screenshot of differentiated and annotated color margin examples in Visual Studio 2022." lightbox="media/vs-2022/git-color-margins-differentiated.png":::
+
+> [!TIP]
+> You can change the colors that Visual Studio displays to help you manage changes. Go to **Tools** > **Options** > **Environment** > **Fonts and Colors** and then choose from the following options:
+> - Track additions in documents under source control
+> - Track deletions in documents under source control
+> - Track modifications in documents under source control
+>
+> :::image type="content" source="media/vs-2022/tools-options-fonts-colors-track-source-control.png" alt-text="Screenshot of the Options dialog box where you can change the colors Visual Studio uses for source control.":::
+
+## Peek Difference support
+
+Color margins are interactive. When you select a color margin, Visual Studio opens the **Peek Difference** user interface (UI) where you can view your changes in the editor without switching context. The Peek Difference UI summarizes the number of added and removed lines and makes it easy to navigate between changes by using the Up and Down arrows.
+
+:::image type="content" source="media/vs-2022/git-peek-difference.png" alt-text="Screenshot of the Peek Difference user interface in Visual Studio as it relates to source control." lightbox="media/vs-2022/git-peek-difference.png":::
+
+You can also access Peek Difference when you right-click a line that includes changes. A context menu appears where you can select **Peek Difference** from it. Or, you can use the **Alt**+**F8** keyboard shortcut.
+
+:::image type="content" source="media/vs-2022/git-peek-difference-context-menu-inline.png" alt-text="Screenshot of the right-click context menu in Visual Studio where you can select Peek Difference." lightbox="media/vs-2022/git-peek-difference-context-menu-expanded.png":::
+
+> [!NOTE]
+> If you prefer an inline difference view, you can use the **Settings** control in the top-right corner of the **Diff** editor to switch to **Inline mode**.
+>
+> :::image type="content" source="media/vs-2022/git-diff-inline-mode.png" alt-text="Screenshot of the Diff options available from the gear icon, where you can select the 'Inline mode' option." lightbox="media/vs-2022/git-diff-inline-mode.png":::
+
+> [!TIP]
+> You can modify how Visual Studio interacts with code changes in the Peek Difference UI by using the **Click to peek in margin** option from  **Tools** > **Options** > **Text Editor** > **Advanced**.
+> :::image type="content" source="media/vs-2022/text-editor-option-peek-in-margin.png" alt-text="Screenshot of the 'Click to peek in margin' setting.":::
+> For example, you can change the default **Single click** setting to **Double click**, or you can select **None** to turn off the Peek Difference UI.
+
+## Stage chunks of code
+
+You can stage any chunk of code by using the Peek Difference user interface (UI). To do so, hover over the change you want to stage and select **Stage Change**. Alternatively, use the global **Stage** button if you want to stage *all* the changes you made to a document.
+
+:::image type="content" source="media/vs-2022/git-stage-change.png" alt-text="Screenshot of the Stage Change option in Visual Studio 2022." lightbox="media/vs-2022/git-stage-change.png":::
+
+If you prefer a full-screen difference view, you can switch to the **Diff** editor. Here's how: select the **Promote to Document** button :::image type="icon" source="media/vs-2022/promote-document-button.png" border="false"::: on the top-right corner of the [**Peek Difference** UI](#peek-difference-support). Or, you can use the **Ctrl**+**Alt**+**Home** keyboard shortcut. All the features that the Peek Difference UI provides are also available in the **Diff** editor.
+
+:::image type="content" source="media/vs-2022/git-stage-change-difference.png" alt-text="Screenshot of the Stage Change difference view in Visual Studio 2022." lightbox="media/vs-2022/git-stage-change-difference.png":::
+
+## Commit staged changes
+
+After you've prepared your commit by reviewing and staging the changes you want to include, you can create your commit by using the **Git Changes** window. Next, enter a commit message and then select **Commit Staged**.
+
+:::image type="content" source="media/vs-2022/git-commit-staged-changes-inline.png" alt-text="Screenshot of the Git Changes dialog in Visual Studio 2022." lightbox="media/vs-2022/git-commit-staged-changes-expanded.png":::
+
+## Next steps
+
+To continue your journey, visit the [Push to remote](git-push-remote.md) page.
+
+## See also
+
+- [Git experience in Visual Studio](git-with-visual-studio.md)
+- [Visual Studio & GitHub: Better together](https://visualstudio.microsoft.com/vs/github/)

docs/version-control/git-line-staging.md

@@ -2,7 +2,7 @@
 title: Make a Git commit in Visual Studio
 titleSuffix: ""
 description: Make a Git commit in Visual Studio by using Git providers such as GitHub or Azure DevOps.
-ms.date: 11/10/2021
+ms.date: 08/09/2022
 ms.topic: how-to
 author: TerryGLee
 ms.author: tglee
@@ -15,7 +15,7 @@ ms.custom: version-control
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
-The core part of any Git workflow is modifying files and committing the changes in those files.  While this article references GitHub repositories, you can work remotely with the Git provider of your choice, such as GitHub or Azure DevOps. Or, you can work locally with no provider at all.  
+The core part of any Git workflow is modifying files and committing the changes in those files.  While this article references GitHub repositories, you can work remotely with the Git provider of your choice, such as GitHub or Azure DevOps. Or, you can work locally with no provider at all.
 
 Git tracks file changes in your repo as you work, and separates the files in your repo into three categories. These changes are equivalent to what you would see when you enter the `git status` command in the command line:
 
@@ -47,7 +47,7 @@ When you double-click a **Commit**, Visual Studio opens its details in a separat
 
 ## Next steps
 
-To continue your journey, visit the [Push to remote](git-push-remote.md) page.
+To continue your journey, visit the [Stage lines of code](git-line-staging.md) page.
 
 ## See also
 

docs/version-control/git-make-commit.md

@@ -7,7 +7,7 @@ metadata:
   title: Version control & source control with Git docs # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Use version / source control technologies in Visual Studio. You can share, integrate, and manage your code releases in Git & GitHub without leaving your codebase.
   ms.topic: landing-page
-  ms.date: 07/11/2022
+  ms.date: 08/09/2022
   author: TerryGLee
   ms.author: tglee
   manager: jmartens
@@ -41,6 +41,8 @@ landingContent:
             url: git-create-branch.md
           - text: Make a commit
             url: git-make-commit.md
+          - text: Stage lines of code
+            url: git-line-staging.md
           - text: Push to remote
             url: git-push-remote.md
           - text: Fetch, pull, and sync
@@ -79,8 +81,6 @@ landingContent:
             url: https://devblogs.microsoft.com/visualstudio/vs2022-performance-enhancements-git-branch-switching/
           - text: Supercharge your Git experience (blog)
             url: https://devblogs.microsoft.com/visualstudio/supercharge-your-git-experience-in-vs/
-          - text: Line-staging support (blog)
-            url: https://devblogs.microsoft.com/visualstudio/line-staging-interactive-staging/
           - text: Release notes
             url: /visualstudio/releases/2022/release-notes-preview
           - text: Videos and more...

docs/version-control/index.yml

@@ -19,6 +19,8 @@
     href: git-create-branch.md
   - name: Make a commit
     href: git-make-commit.md
+  - name: Stage lines of code
+    href: git-line-staging.md
   - name: Push to remote
     href: git-push-remote.md
   - name: Fetch, pull, and sync

docs/version-control/media/vs-2022/git-color-margins-differentiated.png

@@ -101,8 +101,8 @@ The initial release of Visual Studio 2022 supports the following platforms and d
 |---------|---------|---------|
 |WPF      |Yes         |Yes         |
 |UWP      |Yes         |Yes         |
-|WinUI3 desktop     |No         |Yes         |
-|MAUI (Android Emulator)     |No         |Yes (px*)         |
+|WinUI3 desktop     |Yes        |Yes         |
+|.NET MAUI|Yes         |Yes     |
 |Xamarin 5.0+ (Android Emulator)     |No          |Yes (px*)         |
 
 > [!NOTE]