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

..

api

Git - Commit action button extension api (#154555)

2022-07-12 17:06:16 +02:00

ipc

Git - enable using the editor as the git commit input (#152158)

2022-06-16 16:27:35 +02:00

test

git should open merge editor with detail and description (tag and commit-hash)

2022-05-17 13:46:42 +02:00

actionButton.ts

Git - Enable action button while rebasing (#155744)

2022-07-20 23:35:05 -07:00

askpass-empty.sh

…

askpass-main.ts

…

askpass.sh

…

askpass.ts

Git - enable using the editor as the git commit input (#152158)

2022-06-16 16:27:35 +02:00

autofetch.ts

…

commands.ts

SCM - Fixed a regression due to which post-commit commands were not being executed (#155824)

2022-07-21 12:25:15 +02:00

decorationProvider.ts

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

decorators.ts

…

emoji.ts

…

encoding.ts

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

fileSystemProvider.ts

…

git-base.ts

…

git-editor-empty.sh

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

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

git-editor-main.ts

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

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

git-editor.sh

Git - Maintain spaces in the arguments (#154685)

2022-07-11 02:28:57 -07:00

git.ts

Git - Use GIT_EDITOR environment variable to suppress the git commit editor during rebase (#155748)

2022-07-20 17:52:56 +02:00

gitEditor.ts

Git - enable using the editor as the git commit input (#152158)

2022-06-16 16:27:35 +02:00

log.ts

Git log level polish (#151095)

2022-06-02 09:10:18 -04:00

main.ts

Git - Commit action button extension api (#154555)

2022-07-12 17:06:16 +02:00

model.ts

Git - Add events to IPostCommitCommandsProviderRegistry (#155051)

2022-07-14 10:46:57 +02:00

postCommitCommands.ts

Git - Add events to IPostCommitCommandsProviderRegistry (#155051)

2022-07-14 10:46:57 +02:00

protocolHandler.ts

Git - add support for SSH Uri (#152051)

2022-06-14 20:41:54 +02:00

pushError.ts

…

remotePublisher.ts

…

remoteSource.ts

…

repository.ts

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

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

staging.ts

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

statusbar.ts

Git - The git.sync command should use the git.rebaseWhenSync setting (#155511)

2022-07-18 18:38:58 +02:00

terminal.ts

Git - enable using the editor as the git commit input (#152158)

2022-06-16 16:27:35 +02:00

timelineProvider.ts

git - use different icon for uncomitted changes (#145781)

2022-04-23 09:44:45 +02:00

uri.ts

use git-fs to read base, ours, and theirs

2022-05-11 12:04:04 +02:00

util.ts

Use .?method() in more places (#152112)

2022-06-15 16:28:31 +00:00

watch.ts

…