From 39260815e14137e75a153d8d743a1dcc52075d8d Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue, 19 Mar 2019 19:42:22 +0100 Subject: [PATCH 1/4] Add link to section on Visual Studio Code. --- A-git-in-other-environments.asc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/A-git-in-other-environments.asc b/A-git-in-other-environments.asc index 678b69a17..496af0a65 100644 --- a/A-git-in-other-environments.asc +++ b/A-git-in-other-environments.asc @@ -11,6 +11,8 @@ include::book/A-git-in-other-environments/sections/guis.asc[] include::book/A-git-in-other-environments/sections/visualstudio.asc[] +include::book/A-git-in-other-environments/sections/visualstudiocode.asc[] + include::book/A-git-in-other-environments/sections/eclipse.asc[] include::book/A-git-in-other-environments/sections/sublimetext.asc[] From a6f7be4c86ce6844e58d5aafb386ddd358db23be Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue, 19 Mar 2019 19:43:44 +0100 Subject: [PATCH 2/4] Added section on Visual Studio Code. --- .../sections/visualstudiocode.asc | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 book/A-git-in-other-environments/sections/visualstudiocode.asc diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc new file mode 100644 index 000000000..b448b8248 --- /dev/null +++ b/book/A-git-in-other-environments/sections/visualstudiocode.asc @@ -0,0 +1,20 @@ +=== Git in Visual Studio Code + +Visual Studio Code has git support built in. You will need to have git version 2.0.0 (or newer) installed. + +The main features are: + +* See the diff of the file you are editing in the gutter. +* The Git Status Bar (lower left) shows the current branch, dirty indicators, incoming and outgoing commits. +* You can do the most common git operations from within the editor: +** Initialize a repository. +** Clone a repository. +** Create branches and tags. +** Stage and commit changes. +** Push/pull/sync with a remote branch. +** Resolve merge conflicts. +** View diffs. +* With a extension, you can also handle GitHub Pull Requests: + https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github + +The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol \ No newline at end of file From 830f69fc59c695d34952af88b167eadbb8261ec2 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue, 19 Mar 2019 22:10:44 +0100 Subject: [PATCH 3/4] Made links clickable. --- .../A-git-in-other-environments/sections/visualstudiocode.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc index b448b8248..bf394fc79 100644 --- a/book/A-git-in-other-environments/sections/visualstudiocode.asc +++ b/book/A-git-in-other-environments/sections/visualstudiocode.asc @@ -15,6 +15,6 @@ The main features are: ** Resolve merge conflicts. ** View diffs. * With a extension, you can also handle GitHub Pull Requests: - https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github + https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[] -The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol \ No newline at end of file +The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[] \ No newline at end of file From 67e187ffa7baebb6f7468cae982e4e83ab3ad85f Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Tue, 19 Mar 2019 22:22:01 +0100 Subject: [PATCH 4/4] Removed unnecessary space. --- book/A-git-in-other-environments/sections/visualstudiocode.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/A-git-in-other-environments/sections/visualstudiocode.asc b/book/A-git-in-other-environments/sections/visualstudiocode.asc index bf394fc79..33730912e 100644 --- a/book/A-git-in-other-environments/sections/visualstudiocode.asc +++ b/book/A-git-in-other-environments/sections/visualstudiocode.asc @@ -14,7 +14,7 @@ The main features are: ** Push/pull/sync with a remote branch. ** Resolve merge conflicts. ** View diffs. -* With a extension, you can also handle GitHub Pull Requests: +* With a extension, you can also handle GitHub Pull Requests: https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github[] The official documentation can be found here: https://code.visualstudio.com/Docs/editor/versioncontrol[] \ No newline at end of file