Commit Graph

632 Commits

Author SHA1 Message Date
Benjamin Pasero ca6a055ba2 git - once again fix broken selection syncing 2017-10-12 17:52:55 +02:00
Joao Moreno 1f058ae1cb diff: fix stage/revert ranges 2017-10-11 17:17:10 +02:00
Joao Moreno 45fa36902e diff: snappier stage 2017-10-11 15:27:37 +02:00
Joao Moreno 7d729c9d17 diff: inline actions 2017-10-11 15:16:47 +02:00
Johannes Rieken e73da33e4f add back untracked color, remove suffix for now 2017-10-10 17:09:35 +02:00
Johannes Rieken 73164106d5 simplify git decorations... 2017-10-10 17:09:34 +02:00
Johannes Rieken 5c109769f0 use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored 2017-10-10 17:08:53 +02:00
Joao Moreno dfc3c944a4 remove unused variable 2017-10-10 16:05:37 +02:00
Joao Moreno ccb7910128 git content provider checks the wrong cache key
fixes #35559
2017-10-10 10:22:11 +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 58b990f3ef be more careful with git init
fixes #35902
2017-10-09 14:52:10 +02:00
Dmitry Kabardinov 22d926fed6 Git - show there are no changes to stash message only if there are neither staged nor unsataged files (#35645) 2017-10-06 14:27:01 +03:00
Dmitry Kabardinov 27e4463134 Commit unstaged files after pop-up confirmation (#35185) 2017-10-06 13:06:09 +03: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 bcb3e0d00e detect conflict markers when staging
fixes #33983
2017-10-03 10:21:20 +02:00
Markus Wolf 24a31523f9 Merge remote-tracking branch 'upstream/master' into git-clone-with-url 2017-10-02 12:24:56 +02:00
Markus Wolf 855a55d755 fix: use single remote automatically
If there is only one remote configured just use it instead of aksing the user which remote to use.

Closes #35373
2017-10-02 11:31:59 +02:00
Matthew Ferderber 26aa18de15 use previous commit msg for amend, Fixes #35182 2017-09-29 17:21:14 -04:00
Joao Moreno 3b76085a6c fixes #35216 2017-09-28 11:51:40 +02:00
Joao Moreno a13fdcbf50 Repository.close
fixes #35041
2017-09-28 11:09:44 +02:00
Joao Moreno ae7e9613ce fixes #34358 2017-09-28 10:05:20 +02:00
Joao Moreno 5b3d47b0bb fixes #35044 2017-09-27 17:20:04 +02:00
Joao Moreno 826c2ae009 fix #33692 2017-09-27 16:47:42 +02:00
Joao Moreno 1ca31aa6db git.ignore should detect workspaces
fixes #35176
2017-09-27 12:23:42 +02:00
kieferrm 08d8f0f9f6 indentation changes 2017-09-25 18:36:43 -07:00
kieferrm fbb3e25987 omit endPoint where it defaults to none 2017-09-25 18:36:43 -07:00
kieferrm 32282d2be9 GDPR classification for git extension 2017-09-25 18:36:43 -07:00
Jeyanthinath 282afd5979 fixed hygiene 2017-09-23 13:12:02 +05:30
Jeyanthinath b25ad5c74d fix vscode #32681 2017-09-23 12:49:37 +05:30
Johannes Rieken 57aab4f84c Merge branch 'master' into joh/ftp 2017-09-20 13:48:02 +02:00
Joao Moreno 01dade32b7 fix #34645 2017-09-20 13:36:47 +02:00
Martin Thierer 40563b1af9 Compare to correct Ressource-URI when fetching content 2017-09-20 12:09:47 +02:00
isidor 93867e4ef2 merge master 2017-09-20 10:08:51 +02:00
Benjamin Pasero d0668fb167 git: leverage new ViewColumn.Active 2017-09-20 09:29:14 +02:00
Raoul D'Cunha 21aac84936 Add support for Stash (Include Untracked) 2017-09-20 17:06:52 +12:00
isidor ceb34634b1 always use uri.toString() when comparing uris for equality 2017-09-19 15:59:23 +02:00
Joao Moreno a29640931a Merge branch 'splitview' into scm-viewlet 2017-09-18 11:32:04 +02:00
Joao Moreno 867e521341 dont read XDG_RUNTIME_DIR 2017-09-15 12:57:16 +02:00
Joao Moreno 1b314f3ef4 scm: rootUri api 2017-09-13 12:09:54 +02:00
Joao Moreno 5a4a40c9cb fixes #34209 2017-09-12 15:13:49 +02:00
Markus Wolf 1730fcf7ac feat(git): allow url to be given to git.clone
Closes #33857
2017-09-08 10:51:48 +02:00
Joao 01619d3c34 git: internal git._syncAll command 2017-09-07 12:15:45 +02:00
Joao 11237b630f fixes #33878 2017-09-07 12:14:28 +02:00
Benjamin Pasero 2a936541cb Can no longer open image files from the git viewlet (fixes #33739) 2017-09-05 18:18: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
Joao e0ac453614 fixes #33655 2017-09-01 11:59:10 +02:00
Joao b4210889e5 remove gitContentProvider warning message 2017-09-01 11:36:54 +02:00
Joao f23b0d7974 fixes #33615 2017-09-01 11:23:44 +02:00