kieferrm
3f8bd163f4
update dependency on vscode-extension-telemetry
2017-06-30 09:57:37 -07:00
Joao Moreno
91a02c7a0a
💄
2017-06-26 16:14:29 +02:00
Joao Moreno
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
Joao Moreno
417cdb62b7
git.pullFrom
...
octopus commit
2017-06-26 15:46:51 +02:00
Joao Moreno
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
Joao Moreno
53ce1b0b46
Merge branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master
2017-06-26 15:36:00 +02:00
Joao Moreno
14380f9766
Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738
2017-06-26 15:34:26 +02:00
Joao Moreno
f23a32b7a7
Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge
2017-06-26 09:56:42 +02:00
Krzysztof Cieślak
f9f13f3be9
Add pullFrom command to package.json
2017-06-23 11:16:05 +02:00
NKumar2
9aaeb1989a
Registering and handling commad
2017-06-21 19:51:38 -07:00
Joao Moreno
5667cc0e69
use vsce to determine what to package when bundling extensions
...
fixes #29054
2017-06-21 16:17:21 +02:00
Bugra Cuhadaroglu
39f33ae2ae
Git: Pull from specific branch
2017-06-20 19:52:47 -07:00
Christof Marti
89fa243fc9
Hid Git actions from merge conflict ( fixes #27563 )
2017-05-31 10:28:15 -07:00
Maik Riechert
b96478ebcc
add git delete branch command
2017-05-26 09:27:24 +02:00
Matt Shirley
42ab4c41a4
Add "pullFrom" git command
...
Resolves Microsoft/vscode#26738
2017-05-20 11:07:34 -07:00
Duroktar
54da9357ba
add "open old file" git command
...
this implements #23011
2017-05-14 22:03:38 -03:00
Joao Moreno
0dcb957f4c
Merge branch 'Issue15613_AllFilesCommitted' of https://github.com/seesemichaelj/vscode into seesemichaelj-Issue15613_AllFilesCommitted
2017-05-04 16:32:37 +02:00
Joao Moreno
af6f8aa748
clean up #24950
2017-05-04 16:04:30 +02:00
Joao Moreno
b94f56f7cc
Merge branch 'git-default-branch-directory' of https://github.com/ihalip/vscode into ihalip-git-default-branch-directory
2017-05-04 16:00:45 +02:00
Rokas Gečas
818fa5a50f
#10542 Ability to merge local git branches
2017-05-01 16:44:00 +03:00
Joao Moreno
f0fe019745
🐛 remove git init icon
...
fixes #21103
2017-04-27 11:25:45 +02:00
Joao Moreno
4e636bf50f
🐛 fixes #24052
2017-04-26 17:55:44 +02:00
Mike Seese
5d323a3eca
Add git enableSmartCommit setting
...
If false, this setting will prompt the user if they want to commit all files if none are staged
2017-04-25 23:13:07 -04:00
Joao Moreno
a199b2aa53
✨ merge git.open* commands
2017-04-24 11:47:09 +02:00
Joao Moreno
7cf0ad0440
Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding
2017-04-24 10:25:45 +02:00
Ilie Halip
db4208013f
Merge remote-tracking branch 'upstream/master' into git-default-branch-directory
2017-04-19 18:49:50 +03:00
Joao Moreno
0be6167d9e
Merge branch 'git-perf'
2017-04-19 08:49:07 +02:00
Joao Moreno
fb094b4322
✨ git: huge repo prevention
2017-04-19 08:44:16 +02:00
Ramya Achutha Rao
84af63a933
Increment version of vscode extension telemetry module
2017-04-18 14:46:35 -07:00
Joao Moreno
6146b9739a
⚡ git: run status without buffering whole output
2017-04-18 17:16:20 +02:00
Ilie Halip
f19aa21df8
added config option git.cloneDirectory, defaulting to os.homedir()
2017-04-18 15:26:28 +03:00
Vakhurin Sergey
74349805ab
Added support for encodings for Git.
...
Fixes #21146
**Bug**
Git always uses utf8 encoding for retrieving file contents.
**Fix**
Pass the 'files.encoding' configuration property to the git-extension and use this encoding to decode git output.
2017-04-17 23:00:08 +03:00
Joao Moreno
85b04dc330
🎨 git.ignoreLegacyWarning
2017-04-13 10:04:48 +02:00
Joao Moreno
8d01db6d53
🐛 split git open file/changes into two sets of commands
...
fixes #23729
2017-03-31 11:08:53 +02:00
Joao Moreno
0747f366f0
🐛 change scm/resource/context to scm/resourceState/context
...
fixes #23653
2017-03-30 14:42:44 +02:00
Joao Moreno
ccfcbe6c6f
scm: move from pull to push model
2017-03-29 22:44:25 +02:00
Christof Marti
60f1c78b2d
Add telemetry to new git.clone action - take 2 ( fixes #21563 )
2017-03-27 11:08:12 -07:00
Joao Moreno
afdaf562ee
🐛 fix git clone command
...
fixes #22620
2017-03-20 15:49:34 +01:00
Joao Moreno
ce84678f7f
🐛 exclude extensions from git menu actions
...
fixes #22373
2017-03-10 11:28:34 +01:00
Joao Moreno
fc3ed5f134
🐛 fixes #22059
2017-03-08 16:29:21 +01:00
Joao Moreno
92fa446ce0
git: remove long commit setting
...
related to #21144
2017-02-22 16:48:04 +01:00
Joao Moreno
ca1deee166
git: give up on using the editor
...
fixes #20983
2017-02-21 11:55:27 +01:00
kieferrm
a64e40b442
upgrade telemetry used by git ext
2017-02-20 20:15:21 -08:00
Joao Moreno
5c4923b25d
git: telemetry events
2017-02-20 19:37:46 +01:00
Joao Moreno
cc71202224
git: clone command
2017-02-20 15:54:29 +01:00
Joao Moreno
f73c34eb2d
git: revert selected ranges
2017-02-17 21:57:24 +01:00
Joao Moreno
bb6d6000e9
git: unstage ranges
2017-02-17 16:36:17 +01:00
Joao Moreno
354059915b
git: stage ranges
2017-02-17 16:12:13 +01:00
Joao Moreno
b19f71988d
git: init icon
2017-02-16 11:36:44 +01:00
Joao Moreno
ca27a87b05
git: hide/show commands based on state
2017-02-16 10:23:15 +01:00
