Commit Graph

419 Commits

Author SHA1 Message Date
Joao Moreno
d880689924 git: fetch from all remotes
fixes #56463
2018-09-12 16:21:11 +02:00
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
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
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
nesukun
907a021f74 Add support for force push and force-with-lease 2018-09-08 23:40:07 +01: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
Tom Basche
fd2e5ac7f8 Add the ability to push empty commits 2018-08-09 11:48:08 +10:00
wistcc
06447486bb Merge branch 'master' into WC/55376 2018-08-07 22:45:56 -04:00
wistcc
64076e6d66 Adding the git.showStagedChangesResourceGroup config property 2018-08-07 22:41:34 -04:00
Joao Moreno
a8b426471a fixes #55696 2018-08-07 16:16:11 +02:00
Joao Moreno
0615dbe00a docs 2018-08-07 10:35:05 +02:00
Joao Moreno
37ebbbec40 docs 2018-08-07 10:34:18 +02:00
Joao Moreno
45e9530554 fixes #55696 2018-08-06 16:07:17 +02:00
Joao Moreno
52d71bba27 fixes #55563 2018-08-06 16:05:10 +02:00
Pine Wu
c9764c85d7 Settings description update for #54690 2018-08-01 14:46:33 -07:00
Rachel Macfarlane
740d37d7dd Some setting descriptions cleanup, #54690 2018-07-25 11:02:07 -07:00
Jackson Kearl
f99a1e6505 Dots 2018-07-23 16:02:21 -07:00
Konstantin Müller
c56219e13d #54204 add commands to apply stash 2018-07-14 10:01:47 +02:00
Joao Moreno
ee0a7a265d Merge branch 'master' of github.com:Microsoft/vscode 2018-07-09 10:15:59 +02:00
Joao Moreno
b18b795936 fixes #53668 2018-07-09 10:15:55 +02:00
Joao Moreno
689c38f4aa 💄 2018-07-06 15:19:27 +02:00
Joao Moreno
4215f96251 Merge commit 'refs/pull/48020/head' of github.com:Microsoft/vscode into pr/48020 2018-07-06 15:10:34 +02:00
Joao Moreno
da1a35aabc Merge commit 'refs/pull/47890/head' of github.com:Microsoft/vscode into pr/47890 2018-07-06 15:07:20 +02:00
Joao Moreno
50189ad617 Merge commit 'refs/pull/47819/head' of github.com:Microsoft/vscode into pr/47819 2018-07-06 14:54:42 +02:00
Joao Moreno
ead170df00 Merge commit 'refs/pull/47790/head' of github.com:Microsoft/vscode into pr/47790 2018-07-06 14:48:10 +02:00
wistcc
5c02579269 Adding the git.syncRebase setting 2018-06-20 21:11:36 -04:00
Morten Henriksen
83da71325c Add branch name validation and whitespace config
* Adds `git.createBranchNameConvention.regexp`
* Adds `git.createBranchWhitespaceChar`

Fixes #50241
2018-05-29 19:55:41 +02:00
wbarajas@umich.edu
2c2122ee5d feature: add support to manually add repositories 2018-04-16 22:35:18 -04:00
Adit Bhatt
59c06466c2 feat: add support for ignored repositories list 2018-04-14 22:55:23 -04:00
Pradeep Murugesan
f1a362b250 Commit always using sign off flag setting 47395 2018-04-13 11:28:35 +02:00
Ivor Huang
ee748ab5c8 implement push success notification for issue #39039 2018-04-12 20:48:31 -04:00
David
9c848a3b8b Merge branch 'master' into ddruker/differentiate-foreground-color-git 2018-03-19 10:16:42 -04:00
Joao Moreno
27c68d9258 :liptstick: 2018-03-19 14:30:31 +01:00
DAVID DRUKER
ab19d7b43d add custom color for files added to index 2018-03-18 14:06:12 -07:00
Shobhit Chittora
1c6aa0e93d Adds workspace config for submodules detection limit
Closes #45266
2018-03-14 10:09:04 +05:30
Joao Moreno
a563e2cb38 consolidate git extensions
related to #43978
2018-02-20 16:47:01 +01:00
Joao Moreno
38ab734646 improve input validation setting description 2018-02-09 12:05:45 +01:00
Joao Moreno
ec218b9088 fix bad english 2018-02-02 16:39:13 +01:00
Joao Moreno
2d4b6e9124 fixes #40947 2018-02-01 09:40:22 +01:00
Joao Moreno
888f74495d lineWarningLength -> validationProvider 2018-01-26 16:43:53 +01:00
Joao Moreno
786ea020f7 optionally show Open File action
fixes #41137
2018-01-26 15:29:21 +01:00
Joao Moreno
41886d2793 fix smoketests 2018-01-26 11:36:40 +01:00
Sam Ervin
3c8ed9206f Correct "branchs" to "branches" typo 2018-01-17 11:50:38 -06:00
Joao Moreno
3017bc0f9c git submodule decorations 2017-12-14 12:03:54 +01:00
Joao Moreno
6793990e25 move autoRepositoryDetection implementation 2017-12-11 17:51:40 +01:00