ad42ab6723
Merge pull request #30068 from maryam-a/29706-maryam-a-git-progress-bar
...
Show git clone progress in status bar and source control feed
2017-08-17 09:54:28 +02:00
a6907bc57f
use properties
2017-08-16 10:14:03 +02:00
f9f06beefa
Merge branch '25849' of https://github.com/marckassay/vscode into marckassay-25849
2017-08-16 10:06:33 +02:00
bbe70bc9b9
fixes #32459
2017-08-15 11:31:45 +02:00
5553acb377
cleanup git stash functionality
2017-08-15 10:03:42 +02:00
8dcb181fbc
Load stashes only when needed
2017-08-14 22:44:42 +02:00
b5bf3535ef
Fix stash pop
2017-08-14 22:30:52 +02:00
13484ae98d
Add commands
2017-08-14 22:30:50 +02:00
4cd45c49bd
Repository and Model changes
2017-08-14 22:30:36 +02:00
2f57095b91
Merge pull request #29264 from Krzysztof-Cieslak/commit_amend
...
Add Git commit amend commands
2017-08-11 09:02:12 +01:00
688df5e5cc
Merge pull request #27882 from marckassay/24919
...
For 'conflict (add/add)' and 'conflict (modify/delete)' issues
2017-08-10 15:04:53 +01:00
2e35b736de
💄
2017-08-10 16:01:01 +02:00
9cda6465b4
Merge branch 'feature-git' of https://github.com/eamodio/vscode into eamodio-feature-git
2017-08-10 15:55:59 +02:00
e12c7d3830
Merge branch 'ashutoshdhundhara-git-tag'
2017-08-10 15:44:23 +02:00
37de7e182f
git: cleanup tag
2017-08-10 15:44:10 +02:00
0bd753f8a1
Merge branch 'git-tag' of https://github.com/ashutoshdhundhara/vscode into ashutoshdhundhara-git-tag
2017-08-10 15:38:26 +02:00
7494a1b944
Merge pull request #27136 from dmportella/gpg-support
...
GPG support
2017-08-10 09:48:20 +01:00
e122921970
Merge pull request #26147 from samlh/patch-1
...
Fix staging lines to not corrupt line endings when autocrlf is enabled
2017-08-10 09:39:44 +01:00
c0381f2b62
Closes #27410 - support multi-select on open file/changes commands
...
Also stops the opening of an editor from stealing focus -- so that it is much easier to keyboard around (it also aligns with the behavior of the main file explorer)
2017-08-09 00:27:09 -04:00
ff1d9f13c6
added Config information
...
Ticket #5065
2017-07-11 17:09:36 +01:00
d266d9a994
[WIP] Added support for -S for signing git commits
...
Ticket #5065
2017-07-11 17:09:36 +01:00
35d598a2e3
fixes #30085
2017-07-10 10:38:24 +02:00
dbbc064c13
fixes #30214
2017-07-07 12:22:25 +02:00
3e34503afc
git: remove unused command
2017-07-06 10:11:20 +02:00
428ad7c39c
fixes #30162
2017-07-06 09:21:33 +02:00
4f50b29e92
Addresses #26184 - use configuration for pinned default ( #27357 )
...
* Addresses #26184 - use configuration for pinned default
* Honors the preview editor setting above all
* Removes passing undefined to pinned internally
re: requested code review changes
* Removes unnecessary undefined
* feedback
2017-07-06 08:12:39 +02:00
313aad16d0
fixes #21439
2017-07-05 16:31:34 +02:00
263278aaed
Resolve timeout issue
2017-07-03 16:08:08 -04:00
e989a259d3
Show git clone progress in status bar and source control feed
2017-07-03 15:28:15 -04:00
ac78ebd870
fixes #30054
2017-07-03 17:28:33 +02:00
a05d64d7f0
fixes #29448
2017-06-29 11:05:39 +02:00
ab3c945e0e
Import 'nls' in extensions entry point. Fixes #29098 .
2017-06-28 16:01:23 +02:00
60efdae34c
fixes #27595
2017-06-28 15:54:13 +02:00
fd2173a817
fixes #29728
2017-06-28 11:40:34 +02:00
dc4e07da58
Added git\src\model tooltip for decorations.
2017-06-27 12:46:58 -04:00
d9bae437cc
fixes #26034
2017-06-27 15:39:40 +02:00
dd07972305
fixes #27488
2017-06-27 12:40:28 +02:00
91a02c7a0a
💄
2017-06-26 16:14:29 +02:00
2f54b0001b
Merge branch 'feature-git-open-old-file' of https://github.com/Duroktar/vscode into Duroktar-feature-git-open-old-file
2017-06-26 16:09:44 +02:00
417cdb62b7
git.pullFrom
...
octopus commit
2017-06-26 15:46:51 +02:00
5f31035e46
Merge branch 'git_pull_from' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-git_pull_from
2017-06-26 15:36:17 +02:00
53ce1b0b46
Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master
2017-06-26 15:36:00 +02:00
14380f9766
Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738
2017-06-26 15:34:26 +02:00
842421f3f5
catch merge conflicts
2017-06-26 11:18:18 +02:00
df9c7d01b5
💄
2017-06-26 11:05:59 +02:00
f23a32b7a7
Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge
2017-06-26 09:56:42 +02:00
d5eda85077
streamline git ignore
2017-06-26 09:49:34 +02:00
eef5090751
Fixing formatting of model.ts
2017-06-23 17:32:04 -07:00
31bef546a7
Don't rebase on pull from
2017-06-23 17:27:33 +02:00
df4d817111
Add pullFrom command
2017-06-23 11:09:44 +02:00
João Moreno
Joao Moreno
Krzysztof Cieślak
Eric Amodio
Daniel Portella
Maryam Archie
Michel Kaporin
Marc Kassay
Bugra Cuhadaroglu