Skip to content

Commit 0a1b4d7

Browse files
author
stevestein
committed
fix links
1 parent 7db9048 commit 0a1b4d7

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

docs/carbon/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
## [Integrated terminal (PowerShell, Bash)](integrated-terminal.md)
2929
## [Keyboard shortcuts](keyboard-shortcuts.md)
3030
## [Server groups](server-groups.md)
31-
## [Source control](configure-source-control.md)
31+
## [Source control](source-control.md)
3232
## [Workspace & user settings](settings.md)
3333
## [Windows authentication (Kerberos)](enable-kerberos.md)
3434
# Reference

docs/carbon/source-control.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Carbon provides the same integrated source control as VS Code and includes [Git]
2222

2323
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.
2424

25-
![source control providers](images/versioncontrol/scm.png)
2625

2726
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.
2827

@@ -52,11 +51,11 @@ You can also find indicators of the **status of your repository** in the bottom
5251

5352
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.
5453

55-
![git status bar sync](images/versioncontrol/git-status-bar-sync.png)
54+
![git status bar sync](media/source-control/git-overview.png)
5655

5756
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.
5857

59-
![git status bar publish](images/versioncontrol/git-status-bar-publish.png)
58+
![git status bar publish](media/source-control/git-overview.png)
6059

6160
## Commit
6261

@@ -78,7 +77,7 @@ You can create and checkout branches directly within VS code through the **Git:
7877

7978
If you run **Git: Checkout to...**, you will see a dropdown containing all of the branches or tags in the current repository.
8079

81-
![Git checkout](images/versioncontrol/gitbranches.png)
80+
![Git checkout](media/source-control/git-overview.png)
8281

8382
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.
8483

@@ -96,27 +95,27 @@ If you open a folder that is a Git repository and begin making changes, VS Code
9695
* A green bar indicates new added lines
9796
* A blue bar indicates modified lines
9897

99-
![Gutter indicators](images/editingevolved/gutter.png)
98+
![Gutter indicators](media/source-control/git-overview.png)
10099

101100
## Merge Conflicts
102101

103-
![Git merge](images/versioncontrol/merge-conflict.png)
102+
![Git merge](media/source-control/git-overview.png)
104103

105104
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.
106105

107106
## Viewing Diffs
108107

109108
Our Git tooling supports viewing of diffs within VS Code.
110109

111-
![A File Diff in VS Code](images/versioncontrol/diff.png)
110+
![A File Diff in VS Code](media/source-control/git-overview.png)
112111

113112
>**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.
114113
115114
### Diff editor review pane
116115

117116
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.
118117

119-
![diff-review-pane](images/versioncontrol/diff-review-pane.png)
118+
![diff-review-pane](media/source-control/git-overview.png)
120119

121120
**Note:** This experience is especially helpful for screen reader users.
122121

@@ -130,7 +129,7 @@ To open the Git output window, run **View** > **Output** and select **Git** from
130129

131130
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.
132131

133-
![Git initialize repository](images/versioncontrol/git-initialize.png)
132+
![Git initialize repository](media/source-control/git-overview.png)
134133

135134
Running **Initialize Git Repository** will create the necessary Git repository metadata files and show your workspace files as unstaged changes.
136135

@@ -149,7 +148,7 @@ Here are the steps to do so:
149148

150149
Now you can run `git config --global -e` and use VS Code as editor for configuring Git.
151150

152-
![git config in VS Code](images/versioncontrol/gitconfig.png)
151+
![git config in VS Code](media/source-control/git-overview.png)
153152

154153
Add the following to your Git configurations to use VS Code as the diff tool:
155154

@@ -171,7 +170,7 @@ To summarize, here are some examples of where you can use VS Code as the editor:
171170

172171
## Next Steps
173172

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.
175174
* [Basic Editing](/docs/editor/codebasics.md) - Learn about the powerful VS Code editor.
176175
* [Code Navigation](/docs/editor/editingevolved.md) - Move quickly through your source code.
177176
* [Debugging](/docs/editor/debugging.md) - This is where VS Code really shines

0 commit comments

Comments
 (0)