mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00

Files

Johannes Rieken bbbae594da show "Accept Merge" only for files currently under conflict. (#155822 )

While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore

* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar

2022-07-21 13:25:23 +02:00

build

Extract git static contributions into a separate extension

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

resources

…

src

show "Accept Merge" only for files currently under conflict. (#155822 )

2022-07-21 13:25:23 +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

show "Accept Merge" only for files currently under conflict. (#155822 )

2022-07-21 13:25:23 +02:00

package.nls.json

Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192 )

2022-07-14 13:51:47 +00:00

README.md

…

tsconfig.json

use TabInputTextMerge in git extensions

2022-07-14 09:41:54 +02:00

yarn.lock

Switch extensions to 1DS (#154299 )

2022-07-06 17:18:41 -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);