5553acb377
cleanup git stash functionality
2017-08-15 10:03:42 +02:00
b5bf3535ef
Fix stash pop
2017-08-14 22:30:52 +02:00
4cd45c49bd
Repository and Model changes
2017-08-14 22:30:36 +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
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
ac78ebd870
fixes #30054
2017-07-03 17:28:33 +02:00
a05d64d7f0
fixes #29448
2017-06-29 11:05:39 +02:00
dd07972305
fixes #27488
2017-06-27 12:40:28 +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
f23a32b7a7
Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge
2017-06-26 09:56:42 +02:00
faf6134387
Add branch and remote args to pull in model and repository
2017-06-23 11:09:21 +02:00
39f33ae2ae
Git: Pull from specific branch
2017-06-20 19:52:47 -07:00
09e22b8542
fixes #27367
2017-06-14 15:16:34 +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
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
0b7f4425ef
Correct LC_ALL. Resolves #26227
2017-05-10 13:37:52 -07: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
818fa5a50f
#10542 Ability to merge local git branches
2017-05-01 16:44:00 +03:00
9234a7c97c
🐛 dont call iconv with unsupported encodings
...
fixes #25359
2017-04-26 16:58:12 +02:00
facdcded9d
🐛 git status errors are incomplete
...
fixes #25408
fixes #25302
2017-04-26 16:54:45 +02:00
24dcf7a27d
🐛 git always show stderr
...
fixes #23632
2017-04-25 17:37:27 +02:00
566fdd4879
🎨 cleanup git show code
2017-04-24 10:51:08 +02:00
3598679114
don't decode stderr
2017-04-24 10:37:15 +02:00
7cf0ad0440
Merge branch 'git-encoding' of https://github.com/igelbox/vscode into igelbox-git-encoding
2017-04-24 10:25:45 +02:00
fb094b4322
✨ git: huge repo prevention
2017-04-19 08:44:16 +02:00
6146b9739a
⚡ git: run status without buffering whole output
2017-04-18 17:16:20 +02:00
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
dc66fda881
🐛 git: remove lock file checking, replace it with try-catch
2017-04-07 11:52:01 +02:00
12470dccf6
🐛 make askpass work in no-workspace environment
...
fixes #23474
2017-03-29 12:11:33 +02:00
04a4fb0c87
🐛 always call git in english
...
fixes #22355
2017-03-24 09:48:39 +01:00
49bc06dde4
🐛 git: don't push on sync if unnecessary
2017-03-10 15:00:40 +01:00
6814168089
🐛 mkdirp before git.clone
...
fixes #21567
2017-03-08 17:02:19 +01:00
3a12747e1f
fixes #21095
2017-02-22 15:11:08 +01:00
cc71202224
git: clone command
2017-02-20 15:54:29 +01:00
77f0e95307
git: askpass support
2017-02-20 12:28:42 +01:00
c894486977
git: better scoped git behaviour
2017-02-16 16:28:05 +01:00
9a3321404e
git: undo command
2017-02-08 12:59:19 +01:00
63a69695f7
git: always run in english locale
2017-02-06 12:39:08 +01:00
cda3584a99
Use @types/node in extensions ( #19692 )
...
Switches builtin extensions to use @types/node for node definitions. Fixes a few errors that show up as a result of updating to a more modern version of node.d.ts
2017-02-01 15:20:17 -08:00
Joao Moreno
Krzysztof Cieślak
João Moreno
Daniel Portella
Bugra Cuhadaroglu
Maik Riechert
Maik Riechert
Matt Shirley
Ashutosh Dhundhara
Anthony Sottile
Samuel Harrington
Rokas Gečas
Vakhurin Sergey
Matt Bierner