Commit Graph

1265 Commits

Author SHA1 Message Date
João Moreno
7936093c33 git: merge resources should return undefined original resource
related to #109022
2020-11-03 14:33:18 +01:00
Fons van der Plas
b6a02bb4e2 message "Would you like to stage all chages?" (#109272)
The old message,
```
Would you like to automatically stage all your changes and commit them directly?
```
sounds like clicking _Yes_ will do this _automatically_ from now on, which is not the case. I removed _automatically_.
2020-10-28 11:05:07 +01:00
Eric Amodio
16f4a29aa0 Changes URI -> Uri 2020-10-25 22:50:25 -04:00
João Moreno
c781e1f4ff 💄 2020-10-23 14:45:41 +02:00
João Moreno
42e920a18a Merge branch 'master' into pr/108913 2020-10-23 14:32:22 +02:00
tomerstav
039f26db56 Highlight branchs upstream if defined by placing item first in picker 2020-10-23 04:36:17 +00:00
tomerstav
7b936983f6 Renamed rebaseOnto to rebase 2020-10-23 03:35:27 +00:00
João Moreno
0f1904834b 💄 2020-10-22 21:12:13 +02:00
João Moreno
990c0284db Merge branch 'master' into pr/109133 2020-10-22 21:03:56 +02:00
Jordan Bayles
3082f63523 Add Git: Clone Recursively option
This patch adds a new command, Git: Clone Recursively, that adds the
--recursive option to git clone in order to also check out git
submodules.

Bug: 108381
2020-10-21 23:05:48 -07:00
João Moreno
a27961d843 git: improve status bar message 2020-10-21 16:37:49 +02:00
tomerstav
5a76fea0a8 Rewrote logic 2020-10-19 23:24:48 +00:00
Ladislau Szomoru
e1692b33b1 Abort rebase command polish (#108919)
* Abort rebase command polish
2020-10-19 10:59:36 +02:00
tomerstav
741925db11 Implemented rebase onto 2020-10-19 04:13:52 +00:00
Andrey Sinitsyn
b71ede64c1 fix(git): fatal when adding, reverting files or cleaning repo on win32 (#108691)
Fixes issue #108690
2020-10-16 15:26:15 +02:00
Eric Amodio
0ac9d25b81 Closes #91695 - adds emoji support 2020-10-12 14:38:07 -04:00
João Moreno
47116a8acd fixes #108371 2020-10-12 11:04:30 +02:00
João Moreno
7cb2f56439 more uppercase
fixes #108348
2020-10-09 16:24:11 +02:00
Eric Amodio
d8b1776ccb Closes #97407, #93405 2020-10-09 02:31:48 -04:00
Eric Amodio
937b30edf2 Fixes #100610 2020-10-07 16:00:07 -04:00
João Moreno
5a18ae699c 💄 2020-09-28 16:33:29 +02:00
Michael Wood
b8c953da4b Merge branch 'master' into 99129-theme-colour-git-staged 2020-09-28 08:02:47 +02:00
Johannes Rieken
b241d4cd1f fix typo, https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:26:52 +02:00
Johannes Rieken
0a914e0e61 remove priority all togther, maybe add something like severity in the future, https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:13:26 +02:00
Johannes Rieken
8932f62afa adress API feedback https://github.com/microsoft/vscode/issues/54938 2020-09-25 16:13:26 +02:00
michaelwood@onetrail.com
536652aab5 added additional colour options for differing git staging statuses 2020-09-23 20:31:30 +02:00
ChaseKnowlden
e8760a5d6c Fix capitalization of GitHub org 2020-09-17 11:43:03 +02:00
Matt Bierner
50cc1d0e97 Update to use TS 4.1 for building VS Code 2020-09-16 11:58:01 -07:00
MoQ93
17cdb69891 Allow empty tag message in git (#106751) 2020-09-16 10:22:19 +02:00
Matt Bierner
eba1cc8de3 Remove arrays.findIndex
For #103454

This should be a direct map to the `.findIndex` mathod
2020-09-10 10:22:08 -07:00
WhizSid
c334da1952 Multi git executable paths (#85954)
* Multi git executable path

* update `git.path` setting description

* 💄

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
2020-09-10 15:02:37 +02:00
Vyacheslav Pukhanov
663810e275 Adds commands for --no-verify commit variants (#106335)
* add `{allow,confirm}NoVerifyCommit`  options

* adds commit comands with no verify

* handles no verify command variants

* handle no verify commit option

* only display no verify variants when option is set
2020-09-10 11:14:28 +02:00
João Moreno
f41efe546c Merge branch 'master' into pr/85074 2020-09-09 16:35:26 +02:00
João Moreno
d9d314e8c6 Update extensions/git/src/commands.ts 2020-09-09 16:30:24 +02:00
João Moreno
bec65e80de Update extensions/git/src/commands.ts 2020-09-09 16:30:18 +02:00
João Moreno
9ff783bdd6 Update extensions/git/src/commands.ts 2020-09-09 16:29:53 +02:00
Vyacheslav Pukhanov
7792c61393 Update gitignore decorations when .git/info/exclude file is edited (#106270)
* detect local `exclude` file edits

* use `uri.path` to detect exclude file edits

`uri.path` uses forward slash as a path separator indepentent of
the host system, which makes it easier to use with regex
2020-09-09 09:37:56 +02:00
João Moreno
ab8a3f3c44 fixes #105129 2020-09-02 14:42:16 +02:00
Ladislau Szomoru
bbb9784d8b PoliCheck 💄 2020-08-26 14:42:39 +02:00
Ladislau Szomoru
06730e3e29 Azure DevOps pipeline - generate unique test result names (#105148)
* Set suite name based on environment variable
2020-08-21 15:05:15 +02:00
Ladislau Szomoru
b2efcbf687 Add process.arch into the test results file name (#104946) 2020-08-19 07:48:37 +02:00
João Moreno
2f2ba0d764 fixes #102455 2020-08-05 12:09:17 +02:00
João Moreno
db514242e4 fixes #102303 2020-08-05 12:03:52 +02:00
Eric Amodio
8d51d4a419 Hides timeline view if no providers registered
Helps first-run experience, see here:
https://github.com/microsoft/vscode/issues/98614#issuecomment-665693078
2020-07-31 18:37:15 -04:00
João Moreno
7f43164ae4 fixes #101404 2020-07-30 15:53:22 +02:00
João Moreno
be901d8db1 fixes #103053 2020-07-22 10:37:09 +02:00
João Moreno
1ab3137674 git: PushErrorHandler 2020-07-15 15:52:31 +02:00
João Moreno
c85718eb81 git: remote source provider picker command
fixes #102394
2020-07-14 13:57:01 +00:00
Eric Amodio
561f5b6d26 Remove eslint disable -- #101978 2020-07-09 22:47:42 -04:00
João Moreno
10a3aefcd6 fixes #100468 2020-07-07 11:10:46 +02:00