Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add button separator color token #5514

Closed
wants to merge 83 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ebc5fdf
docs: remove example reference from faq section
Evavic44 Jun 15, 2022
d2b13b8
Update to remove references to unsupported in the title bar
Tyriar Jul 6, 2022
85b250a
Revert other change fully
Tyriar Jul 6, 2022
cc99b5c
Add 1.70 release notes placeholders
Jul 7, 2022
06b68cb
Remove HISTCONTROL edge case
Tyriar Jul 7, 2022
f21279c
Merge branch 'main' into vnext
Jul 7, 2022
36838a8
Merge pull request #5410 from Evavic44/refrence-docs
Jul 7, 2022
28e183a
Update manual install instructions
Tyriar Jul 14, 2022
f58d55f
Call out for code-insiders
Tyriar Jul 14, 2022
e62256d
shell-integration -> locate-shell-integration-path
Tyriar Jul 19, 2022
1cc1cd8
Merge branch 'main' into vnext
Jul 19, 2022
b5349c8
Updates for "not in" operator
roblourens Jul 21, 2022
ceb30c6
Add Portability vs performance section
Tyriar Jul 21, 2022
5771387
Update for argsCanBeInterpretedByShell
roblourens Jul 21, 2022
1417895
Stub out terminal/tasks sections
Tyriar Jul 21, 2022
2bb316a
Shell integration release notes
Tyriar Jul 22, 2022
277e10a
Terminal rendering release notes
Tyriar Jul 22, 2022
7b84acf
Polish notes
Tyriar Jul 22, 2022
046747f
Update shell integration docs for 1.70
Tyriar Jul 22, 2022
0d0c873
Update decoration-menu image for changes in 1.70
Tyriar Jul 22, 2022
e025598
Improve comment in example
Tyriar Jul 22, 2022
a1649a4
Update todo note
Tyriar Jul 22, 2022
f00cda6
Add release notes for js-debug arg escaping
roblourens Jul 22, 2022
e733ce3
mention sandbox
bpasero Jul 25, 2022
3b3e665
cli merge input
bpasero Jul 25, 2022
aecc3d6
:lipstick:
bpasero Jul 25, 2022
84efa44
Small edits
Jul 26, 2022
3a9f314
Fix typo added earlier
Jul 26, 2022
dd3848d
use node 14
sbatten Jul 26, 2022
8ff8f54
Update 1.70 vscode.d.ts commit ID
Jul 26, 2022
f9f0ecb
Small edits
Jul 26, 2022
bbf826e
Mention the WWBD extension in the 1.70 release notes
brettcannon Jul 27, 2022
9d1f552
Update release notes
lszomoru Jul 28, 2022
f2d5321
Update release notes
lszomoru Jul 28, 2022
4664ae5
update release notes
aeschli Jul 28, 2022
9d05c54
Update release notes
lszomoru Jul 28, 2022
1a88074
Add mention of Azure Developer CLI extension
Jul 28, 2022
0c8d7f1
add folding gifs
aeschli Jul 28, 2022
473dd7e
docs for manual folding
aeschli Jul 28, 2022
ac8f91e
Adding placeholder sections
mjbvz Jul 28, 2022
aec6f47
Update 1.70 Windows keybindings
Jul 28, 2022
aa10243
Add release notes for getting started experience and interpreter info…
Jul 28, 2022
113d6f5
Merge branch 'vnext' of https://github.com/microsoft/vscode-docs into…
Jul 28, 2022
a3be02d
Merge branch 'vnext' of https://github.com/microsoft/vscode-docs into…
Jul 28, 2022
55ac276
Merge branch 'vnext' of https://github.com/microsoft/vscode-docs into…
andreamah Jul 29, 2022
5ed9ca3
1.70 release notes
andreamah Jul 29, 2022
730d787
Merge pull request #5500 from microsoft/andreamah/1_70
andreamah Jul 29, 2022
4220c9f
Update 1.70 settings
Jul 29, 2022
acb733b
thank yous
bpasero Jul 29, 2022
53c7511
add set/clear display language in web
sandy081 Jul 29, 2022
6ffa24f
Add settings profiles doc
sandy081 Jul 29, 2022
a699bfc
docs: tree find widget
joaomoreno Jul 29, 2022
c9a116f
Add placeholders
alexdima Jul 29, 2022
7785751
Writing the release notes for the keep lines option and the sticky sc…
Jul 29, 2022
0cf088d
Merge pull request #5503 from aiday-mar/vnext
alexdima Jul 29, 2022
0b1841f
Fix typo
PKief Jul 29, 2022
0627cc4
Merge pull request #5504 from PKief/patch-3
Jul 29, 2022
460fdec
Add my release notes
lramos15 Jul 29, 2022
ad524cc
Add Debian package dependencies notes, Settings profiles demo
rzhao271 Jul 29, 2022
5007542
add task updates
meganrogge Jul 29, 2022
1c604c2
tweak
meganrogge Jul 29, 2022
b1ac369
Update .vscode/settings.json
meganrogge Jul 29, 2022
5d01970
Update .vscode/settings.json
meganrogge Jul 29, 2022
9ab0c6f
Update .vscode/settings.json
meganrogge Jul 29, 2022
5fdb62b
add release notes for 1.70
sbatten Jul 29, 2022
69e30ca
Merge branch 'vnext' into merogge/task-notes
meganrogge Jul 29, 2022
4550757
Merge branch 'merogge/task-notes' of https://github.com/microsoft/vsc…
meganrogge Jul 29, 2022
d2af339
Merge pull request #5507 from microsoft/merogge/task-notes
meganrogge Jul 29, 2022
54ff435
add macos zooming
sbatten Jul 29, 2022
93d9f9d
Update 1.70 Linux keybindings
Jul 29, 2022
9002cc0
Formatting, take out merge conflict markers
Jul 29, 2022
7b4bc65
Update 1.70 macOS keybindings
Jul 29, 2022
6661865
Remove reference to my reverted PR
gjsjohnmurray Jul 30, 2022
79c8db7
Merge pull request #5508 from gjsjohnmurray/patch-1
Jul 30, 2022
a4b5345
Edit pass on 1.70 release notes
Aug 1, 2022
c1e7263
Add a couple Jupyter items
greazer Aug 1, 2022
ddb3d66
added release notes on code actions widget! (#5512)
justschen Aug 1, 2022
5f88fa7
Add init VS Code Server notes
tanhakabir Aug 1, 2022
e42482c
Update v1_70.md
paulacamargo25 Aug 1, 2022
cbdab49
Add ctrl+c run recent command keybinding as well
Tyriar Aug 1, 2022
8e6008d
3 way merge editor improvements.
hediet Aug 1, 2022
91f5fb5
interactive window restore
rebornix Aug 1, 2022
71c3eb9
Add button separator color token
Aug 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cli merge input
  • Loading branch information
bpasero committed Jul 25, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 3b3e665f79672f009f36ce9a2fde0bbbe31d15fb
15 changes: 15 additions & 0 deletions release-notes/v1_70.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,22 @@ We really appreciate people trying our new features as soon as they are ready, s

## Workbench

### New command line option `--merge`

You can now use command line options to bring up the merge editor in VS Code:

```
-m --merge <path1> <path2> <base> <result> Perform a three-way merge by providing paths for two modified versions of a file, the common origin of both modified versions and the output file to save merge results.
```

This enables to use VS Code as merge tool for Git, e.g. if you configure this in the `.gitconfig`:

```properties
[merge]
tool = code-insiders
[mergetool "code-insiders"]
cmd = code-insiders --wait -m $REMOTE $LOCAL $BASE $MERGED
```

## Terminal

Expand Down