Commit Graph

897 Commits

Author SHA1 Message Date
Joao Moreno
a915b67582 introduce git.fetchOnPull
related to #56463
2018-09-12 16:15:35 +02:00
Joao Moreno
9b0eee12d3 💄 commit empty 2018-09-12 15:46:40 +02:00
Joao Moreno
e2b2b5bc9d Merge branch 'master', commit 'refs/pull/56048/head' of github.com:Microsoft/vscode into pr/56048 2018-09-12 15:37:41 +02:00
João Moreno
3f51b7fd11 Merge pull request #55975 from wistcc/WC/55915
Fixing text when reverting changes for deleted file
2018-09-12 15:31:34 +02:00
Joao Moreno
5455483afe fix missing resource 2018-09-12 14:56:39 +02:00
Joao Moreno
51e471a663 Merge remote-tracking branch 'origin/master' 2018-09-12 14:54:36 +02:00
Joao Moreno
b920ce8583 💄 2018-09-12 14:54:22 +02:00
Joao Moreno
f82fcb8a0b Merge commit 'refs/pull/55976/head' of github.com:Microsoft/vscode into pr/55976 2018-09-12 14:50:03 +02:00
João Moreno
15344fc6a4 Merge pull request #54897 from segevfiner/checkout-new-remote-branch
Try to checkout a new local branch when checking out a remote branch
2018-09-12 14:46:33 +02:00
João Moreno
24d9eeb9a8 Merge pull request #54867 from Hirico/master
Preserve the revealed area after using "Open File" from git-diff editor (fix #53465)
2018-09-12 12:22:06 +02:00
Joao Moreno
405e853713 💄 2018-09-12 12:03:08 +02:00
Joao Moreno
fa1deaaa34 Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527 2018-09-12 12:01:51 +02:00
Joao Moreno
7ffa9219ae fixes #52037 2018-09-12 11:55:21 +02:00
Joao Moreno
07e7dac2e7 💄 2018-09-12 11:40:25 +02:00
Joao Moreno
f1ef0a7fbe Merge commit 'refs/pull/51111/head' of github.com:Microsoft/vscode into pr/51111 2018-09-12 11:30:29 +02:00
Joao Moreno
f92afbdc3c git: mergebase is a readonly operation 2018-09-11 11:46:02 +02:00
Ivan Sučić
f329e748b9 Fix#35905 2018-09-10 20:46:00 +02:00
Joao Moreno
dec5ac9811 missing git api call forwarding 2018-09-10 15:26:57 +02:00
nesukun
907a021f74 Add support for force push and force-with-lease 2018-09-08 23:40:07 +01:00
Git-Lior
8d147f35b7 fixed no user.email/user.name error message order 2018-09-08 22:57:10 +03:00
Git-Lior
63748f8088 no user.email/user.name error message now shows current values 2018-09-07 14:40:23 +03:00
Git-Lior
1f678697ec Fix #57222 - improve no user.email/user.name config error message 2018-09-07 12:13:28 +03:00
Alex Dima
c36258d23f Use const enums (to inline their values in JS) 2018-09-06 20:39:19 +02:00
Joao Moreno
ad58b37dc2 fixes #53520 2018-09-06 15:23:32 +02:00
Morten Henriksen
d6b82a56e0 Merge remote-tracking branch 'Microsoft/master' into feature/50241-Add_branch_name_validation
* Microsoft/master: (4802 commits)
  Fixes #57415: autoSurround - rename "always" to "languageDefined"
  debug: skip over %0
  explorer view: cut down delay time till progress from 3.2s to 1.2s
  file workspace suffix is empty string
  Revert "debug: do not send terminate to EH debugging"
  Fixes #57411: Rename `autoWrapping` to `autoSurround` to avoid confusions related to text wrapping
  Fixes #57453: Avoid thinking the user typed in the find input when setting the search string value
  Synchronisation notification: - Show extension being synchronised - Delete the downloaded extensions
  [html] fix tests
  debug: do not send terminate to EH debugging
  webpack - let build fail when webpack generates an error or a warning
  [html] update service. Fixes #57445
  node-debug@1.27.6
  more complete fix for #57483
  fix #57351
  fix #57483
  fixes #56015
  dispose of RunOnceScheduler properly
  Fixes Microsoft/monaco-editor#1021: Use ProviderResult in modes.ts
  fix #55607
  ...
2018-08-29 17:58:36 +02:00
Joao Moreno
10e0a22f6d fixes #56015 2018-08-29 13:22:59 +02:00
Bruno Finger
48ef5107a0 #57373 Replace brackets as well upon creating a branch 2018-08-28 12:10:54 +02:00
Joao Moreno
200a7185a0 related to #57224 2018-08-27 16:57:29 +02:00
Joao Moreno
6e909d4132 git: expose error codes in API 2018-08-24 12:24:37 +02:00
Joao Moreno
103715c3cc git: implement API 2018-08-24 12:04:29 +02:00
Joao Moreno
28d2b5d2d6 wip: git api 2018-08-24 11:19:05 +02:00
Joao Moreno
811a6be05b 💄 2018-08-24 11:16:49 +02:00
Joao Moreno
6d2598ad88 git api: repository state 2018-08-24 11:16:49 +02:00
Joao Moreno
a9bc997f23 git api: remotes 2018-08-22 15:38:16 +02:00
Joao Moreno
1845bc3a64 git api: onDidRunGitStatus 2018-08-22 15:26:49 +02:00
Joao Moreno
78d61d55f4 git: use simpler versioning scheme 2018-08-22 15:09:11 +02:00
Joao Moreno
f9982d29d4 git api: make cwd mandatory 2018-08-22 13:06:26 +02:00
Joao Moreno
a49378e26c git: cleaner exports 2018-08-22 12:57:05 +02:00
Joao Moreno
8983d89550 git extension: expose exec/spawn 2018-08-22 12:34:54 +02:00
Joao Moreno
456437dfaa git: api 1 2018-08-22 11:30:07 +02:00
Joao Moreno
ec1c4aeaf5 git api: expose repositories 2018-08-22 11:25:42 +02:00
Joao Moreno
cc5e8c15bf git api 2018-08-21 17:04:07 +02:00
Joao Moreno
257878e3b1 git api: deprecation 2018-08-21 16:41:34 +02:00
Joao Moreno
b00d1b40bc git api: expose gitPath 2018-08-21 16:41:29 +02:00
Joao Moreno
ad4fecadeb git: getAPI 2018-08-21 16:04:00 +02:00
Joao Moreno
0633c77f80 api.d.ts 2018-08-21 12:04:52 +02:00
Joao Moreno
a8deffb86a remove unused code 2018-08-21 12:04:47 +02:00
Johannes Rieken
64b82b2a35 Merge branch 'master' into joh/extpack 2018-08-16 10:07:18 +02:00
Benjamin Pasero
b57003f330 NodeBuffer => Buffer 2018-08-16 07:38:54 +02:00
Johannes Rieken
1b9ede3021 Merge branch 'master' into joh/extpack 2018-08-15 13:55:12 +02:00