João Moreno
8f76a4d0d3
Merge pull request #38563 from graknol/master
...
Git branches sorted by committerdate, latest first.
2017-12-15 15:51:10 +01:00
Joao Moreno
9622ada626
find git in LocalAppData and PATH, win32
...
fixes #40229
2017-12-15 10:38:02 +01:00
Joao Moreno
ea831c196a
fixes #40156
2017-12-14 16:15:38 +01:00
Joao Moreno
c84266207a
revert submodule change with update command
2017-12-14 11:21:27 +01:00
Joao Moreno
9f131c1762
more submodule support, diff colorization
2017-12-13 16:21:12 +01:00
Joao Moreno
13bb4c9b85
detect submodules, make them a part of status
2017-12-13 12:03:53 +01:00
Joao Moreno
26b8508db1
Merge branch 'git-submodules' of https://github.com/petkahl/vscode into petkahl-git-submodules
2017-12-13 10:31:47 +01:00
João Moreno
2aa0d24cf6
Merge pull request #36420 from smbkr/push-ask-upstream
...
Git - Ask to publish branch if there is no upstream
2017-12-12 16:55:56 +01:00
Joel Kuntz
454bf5bdce
Fix #39867 fix git popStash type check
2017-12-07 08:53:05 -04:00
Joao Moreno
618e3806c3
fix missing reference
2017-12-05 10:50:21 +01:00
Joao Moreno
000325a03b
alert when git is missing
...
fixes #38393
2017-11-17 11:35:49 +01:00
Sindre Tellevik
924b1002bb
Git branches sorted by committerdate, latest first.
2017-11-17 00:09:23 +01:00
Joao Moreno
fe20886713
don't spawn git on Windows
...
fixes #32739
2017-11-10 17:50:13 +01:00
Joao Moreno
12c41aa9bd
Merge branch '34527' of https://github.com/raouldc/vscode into raouldc-34527
2017-11-10 17:03:06 +01:00
Joao Moreno
57b2a86868
Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch
2017-11-10 16:51:44 +01:00
Joao Moreno
55882309c8
git: cancel clone
...
fixes #30057
2017-11-10 16:22:12 +01:00
Joao Moreno
e730a65f7a
git image diff: fix index
2017-11-09 18:22:45 +01:00
Joao Moreno
d1b9a70d17
git: data uris
2017-11-09 17:54:00 +01:00
Joao Moreno
4b8c0ce265
git: raw buffer
2017-11-08 15:26:41 +01:00
Matt Bierner
ab1d686a41
Fix a few more errors
2017-11-06 13:43:15 -08:00
Keegan Carruthers-Smith
16089481f0
git: Include GitErrorData in GitError.toString
...
We are passing `GitErrorData` to `JSON.stringify` to include in the string
generated by `GitError.toString`. However, we set `replacer` to `[]`, which
means `JSON.stringify` will _always_ serialize to `{ }`. After this change
GitError messages should be more understandable, and not just say `Failed to
execute git`.
2017-10-26 11:32:48 +02:00
Stuart Baker
3afbdb4126
Ask to publish branch if there is no upstream
2017-10-17 14:38:08 +01:00
Peter Kahle
124b9a4032
Cleaning up handling of Git Submodule status
2017-10-15 21:16:45 -04:00
Peter Kahle
9e2338a8c7
First, naive pass at supporting submodules.
...
Scan for submodules when a module is added, and add those repositories immediately.
2017-10-12 21:43:25 -04:00
Joao Moreno
dfc3c944a4
remove unused variable
2017-10-10 16:05:37 +02:00
Brendan Forster
b1407a87b0
disable lookup for GitHub's version of Git
...
If the classic GitHub for Windows (creatively named github.exe) is installed alongside the new GitHub Desktop (which installs a github.bat file to PATH), we can get into the situation where Code can ask the GUI to authenticate for a private repository, which it doesn't understand.
2017-10-10 18:04:14 +11:00
Joao Moreno
6a6b589eb8
fix compile errors
2017-10-04 15:43:48 +02:00
Joao Moreno
9b7a6b6fb9
fixes #35513
2017-10-04 15:01:32 +02:00
Joao Moreno
ae7e9613ce
fixes #34358
2017-09-28 10:05:20 +02:00
Joao Moreno
01dade32b7
fix #34645
2017-09-20 13:36:47 +02:00
Raoul D'Cunha
21aac84936
Add support for Stash (Include Untracked)
2017-09-20 17:06:52 +12:00
Joao Moreno
5a4a40c9cb
fixes #34209
2017-09-12 15:13:49 +02:00
Joao
cb5d03296f
fix compile error
2017-09-04 11:10:34 +02:00
Matt Bierner
69afce7650
Build using TS 2.5 ( #33705 )
...
* Build using TS 2.5
Fixes #33704
* Remove explicit return type
2017-09-01 13:52:42 -07:00
Justin Horner
e34b313026
Merge branch 'master' into justinhhorner-git-rename-branch
2017-08-21 22:51:06 -04:00
Joao Moreno
3f31510686
git: multirepo revert
2017-08-15 16:20:58 +02:00
Joao Moreno
5553acb377
cleanup git stash functionality
2017-08-15 10:03:42 +02:00
Krzysztof Cieślak
b5bf3535ef
Fix stash pop
2017-08-14 22:30:52 +02:00
Krzysztof Cieślak
4cd45c49bd
Repository and Model changes
2017-08-14 22:30:36 +02:00
Justin Horner
d76ae31041
Add error codes and func for rename branch
2017-08-10 14:03:16 -04:00
Joao Moreno
e12c7d3830
Merge branch 'ashutoshdhundhara-git-tag'
2017-08-10 15:44:23 +02:00
Joao Moreno
37de7e182f
git: cleanup tag
2017-08-10 15:44:10 +02:00
Joao Moreno
0bd753f8a1
Merge branch 'git-tag' of https://github.com/ashutoshdhundhara/vscode into ashutoshdhundhara-git-tag
2017-08-10 15:38:26 +02:00
João Moreno
7494a1b944
Merge pull request #27136 from dmportella/gpg-support
...
GPG support
2017-08-10 09:48:20 +01:00
João Moreno
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
Daniel Portella
ff1d9f13c6
added Config information
...
Ticket #5065
2017-07-11 17:09:36 +01:00
Daniel Portella
d266d9a994
[WIP] Added support for -S for signing git commits
...
Ticket #5065
2017-07-11 17:09:36 +01:00
Joao Moreno
ac78ebd870
fixes #30054
2017-07-03 17:28:33 +02:00
Joao Moreno
a05d64d7f0
fixes #29448
2017-06-29 11:05:39 +02:00
Joao Moreno
dd07972305
fixes #27488
2017-06-27 12:40:28 +02:00
