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
faf6134387
Add branch and remote args to pull in model and repository
2017-06-23 11:09:21 +02:00
8afa14668e
Add git amend commands
2017-06-22 14:22:14 +02:00
febe79bfc1
Adding some logic behind the gitignore entries.
2017-06-21 21:55:27 -07:00
bc2d0e43de
Adding apply edit to the gitignore file.
2017-06-21 19:52:41 -07:00
9aaeb1989a
Registering and handling commad
2017-06-21 19:51:38 -07:00
2bad7de4e3
Util function to append string in file
2017-06-21 19:50:14 -07:00
39f33ae2ae
Git: Pull from specific branch
2017-06-20 19:52:47 -07:00
fd2dac6d58
fixes #28506
2017-06-16 10:00:59 +02:00
a807a515bb
fixes #26642
2017-06-14 16:32:00 +02:00
09e22b8542
fixes #27367
2017-06-14 15:16:34 +02:00
b7b818e8f2
Updated title for merge conflicts
2017-06-01 14:23:03 -04:00
996ced6016
Fixes issue when Git has a 'Modify/Delete' conflict after a merge
2017-06-01 14:23:02 -04:00
2a96848ed4
Fixes issue when Git has an 'ADD/ADD' conflict after a merge
2017-06-01 14:23:02 -04:00
eac49a321b
Git: rename 'Publish' to 'Publish Branch' ( fixes #26133 )
2017-06-01 09:26:37 +02:00
a0a1b9e0d6
fixes #26184
2017-05-26 09:27:28 +02:00
3df1eca296
localize
2017-05-26 09:27:25 +02:00
b348a0b780
handle git branch delete error ("not fully merged")
2017-05-26 09:27:25 +02:00
b96478ebcc
add git delete branch command
2017-05-26 09:27:24 +02:00
191fc7c9d9
Remove git merge conflict decorator
2017-05-22 18:40:14 -07:00
42ab4c41a4
Add "pullFrom" git command
...
Resolves Microsoft/vscode#26738
2017-05-20 11:07:34 -07:00
211e7a3030
[ #25575 ] Add Git Tag feature.
2017-05-20 23:04:30 +05:30
54da9357ba
add "open old file" git command
...
this implements #23011
2017-05-14 22:03:38 -03:00
0b7f4425ef
Correct LC_ALL. Resolves #26227
2017-05-10 13:37:52 -07:00
e707642a3c
git: don't use fs.watch
...
fixes #25175
2017-05-10 11:03:18 +02:00
b3380142b3
Fix staging lines to not corrupt line endings when autocrlf is enabled
...
Pass the --path argument to git hash-object so that filters are correctly applied when staging lines. This prevents lines with crlf from being added to files that have autocrlf=true. Old versions of git can complain quite a bit if you get into this state.
From: https://git-scm.com/docs/git-hash-object
```
--path
Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin.
```
2017-05-07 00:16:02 -07:00
89cd05f877
#10542 MergeItem class created, localized strings
2017-05-05 14:12:31 +03:00
6067977ea9
Merge pull request #26008 from letmaik/git-sync-ahead-behind
...
Show ahead/behind indicator while git syncing
2017-05-05 12:56:12 +02:00
Maryam Archie
Joao Moreno
Michel Kaporin
Marc Kassay
Bugra Cuhadaroglu
Krzysztof Cieślak
NKumar2
Benjamin Pasero
Maik Riechert
Maik Riechert
Phil Price
Matt Shirley
Ashutosh Dhundhara
Duroktar
Anthony Sottile
Samuel Harrington
Rokas Gečas
João Moreno