You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/carbon/source-control.md
+10-11Lines changed: 10 additions & 11 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -22,7 +22,6 @@ Carbon provides the same integrated source control as VS Code and includes [Git]
22
22
23
23
VS Code has support for handling multiple Source Control providers simultaneously. For example, you can open multiple Git repositories alongside your TFS local workspace and seamlessly work across your projects. The **SOURCE CONTROL PROVIDERS** list of the **Source Control** view (`kb(workbench.view.scm)`) shows the detected providers and repositories and you can scope the display of your changes by selecting a specific provider.
24
24
25
-

26
25
27
26
If you would like to install an additional SCM provider, the **Install Additional SCM Providers...** command in the **Source Control** view **More** (...) dropdown will show a list of available SCM provider extensions.
28
27
@@ -52,11 +51,11 @@ You can also find indicators of the **status of your repository** in the bottom
52
51
53
52
There is a **Synchronize Changes** action in the Status Bar, next to the branch indicator, when the current checked out branch has an upstream branch configured. **Synchronize Changes** will pull remote changes down to your local repository and then push local commits to the upstream branch.
54
53
55
-

54
+

56
55
57
56
If there is no upstream branch configured and the Git repository has remotes set up, the **Publish** action is enabled. This will let you publish the current branch to a remote.
58
57
59
-

58
+

60
59
61
60
## Commit
62
61
@@ -78,7 +77,7 @@ You can create and checkout branches directly within VS code through the **Git:
78
77
79
78
If you run **Git: Checkout to...**, you will see a dropdown containing all of the branches or tags in the current repository.
The **Git: Create Branch...** command lets you quickly create a new branch. Just provide the name of your new branch and VS Code will create the branch and switch to it.
84
83
@@ -96,27 +95,27 @@ If you open a folder that is a Git repository and begin making changes, VS Code
Merge conflicts are recognized by VS Code. Differences are highlighted and there are inline actions to accept either or both changes. Once the conflicts are resolved, stage the conflicting file so you can commit those changes.
106
105
107
106
## Viewing Diffs
108
107
109
108
Our Git tooling supports viewing of diffs within VS Code.
110
109
111
-

110
+

112
111
113
112
>**Tip:** You can diff any two files by first right clicking on a file in the Explorer or **OPEN EDITORS** list and selecting **Select for Compare** and then right-click on the second file to compare with and select **Compare with 'file_name_you_chose'**. Alternatively from the keyboard hit `kb(workbench.action.showCommands)` and select **File: Compare Active File With...** and you will be presented with a list of recent files.
114
113
115
114
### Diff editor review pane
116
115
117
116
There is a review pane in the Diff editor which presents changes in a unified patch format. You can navigate between changes with **Go to Next Difference** (`kb(editor.action.diffReview.next)`) and **Go to Previous Difference** (`kb(editor.action.diffReview.prev)`). Lines can be navigated with arrow keys and pressing `kbstyle(Enter)` will jump back in the Diff editor and the selected line.
**Note:** This experience is especially helpful for screen reader users.
122
121
@@ -130,7 +129,7 @@ To open the Git output window, run **View** > **Output** and select **Git** from
130
129
131
130
If your workspace isn't under Git source control, you can easily create a Git repository with the **Initialize Git Repository** command. When VS Code doesn't detect an existing Git repository, you will see a **This workspace isn't yet under git source control.** message in the Git View and the **Initialize Git Repository** command will be available.
Running **Initialize Git Repository** will create the necessary Git repository metadata files and show your workspace files as unstaged changes.
136
135
@@ -149,7 +148,7 @@ Here are the steps to do so:
149
148
150
149
Now you can run `git config --global -e` and use VS Code as editor for configuring Git.
151
150
152
-

151
+

153
152
154
153
Add the following to your Git configurations to use VS Code as the diff tool:
155
154
@@ -171,7 +170,7 @@ To summarize, here are some examples of where you can use VS Code as the editor:
171
170
172
171
## Next Steps
173
172
174
-
*[Intro Video - Git Version Control](/docs/introvideos/versioncontrol.md) - An introductory video providing an overview of VS Code Git support.
173
+
*[Intro Video - Git Version Control](https://code.visualstudio.com/docs/introvideos/versioncontrol) - An introductory video providing an overview of VS Code Git support.
175
174
*[Basic Editing](/docs/editor/codebasics.md) - Learn about the powerful VS Code editor.
176
175
*[Code Navigation](/docs/editor/editingevolved.md) - Move quickly through your source code.
177
176
*[Debugging](/docs/editor/debugging.md) - This is where VS Code really shines
0 commit comments