mirror of https://github.com/microsoft/vscode.git synced 2026-05-20 23:29:57 +01:00

Files

T

Sandeep Somavarapu 22fe16d3e5 adopt merge editor in settings sync

- use merge editor for conflicts
- expose base resource in resource syncrhonziers
- add baseResourceScheme context to contribute Accept Merge button per feature
- support old way of handling conflicts behind an internal setting

2022-06-12 15:49:45 +02:00

build

Extract git static contributions into a separate extension

2021-11-12 11:35:35 +01:00

resources

…

src

Merge branch 'main' into joh/voluminous-lobster

2022-06-10 09:07:30 +02:00

.vscodeignore

Remove cgmanifest.json from git extension

2021-11-12 16:22:08 +01:00

extension.webpack.config.js

Git - use editor as commit message input (#151491 )

2022-06-08 15:45:27 +02:00

package.json

adopt merge editor in settings sync

2022-06-12 15:49:45 +02:00

package.nls.json

Git - use editor as commit message input (#151491 )

2022-06-08 15:45:27 +02:00

README.md

…

tsconfig.json

Git - use editor as commit message input (#151491 )

2022-06-08 15:45:27 +02:00

yarn.lock

Git - branch protection (#149360 )

2022-05-13 02:15:01 -07:00

README.md

Git integration for Visual Studio Code

Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

Features

See Git support in VS Code to learn about the features of this extension.

API

The Git extension exposes an API, reachable by any other extension.

Copy src/api/git.d.ts to your extension's sources;
Include git.d.ts in your extension's compilation.

Get a hold of the API with the following snippet:

const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git').exports;
const git = gitExtension.getAPI(1);