Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,997 Commits 3,663 Branches 358 Tags
2edb9bc9ca22ac478890af3e449727393b92097b
Commit Graph

341 Commits

Author SHA1 Message Date
tomerstav
741925db11 Implemented rebase onto 2020-10-19 04:13:52 +00:00
Andrey Sinitsyn
b71ede64c1 fix(git): fatal when adding, reverting files or cleaning repo on win32 (#108691) 
Fixes issue #108690
 2020-10-16 15:26:15 +02:00
João Moreno
47116a8acd fixes #108371 2020-10-12 11:04:30 +02:00
ChaseKnowlden
e8760a5d6c Fix capitalization of GitHub org 2020-09-17 11:43:03 +02:00
Matt Bierner
50cc1d0e97 Update to use TS 4.1 for building VS Code 2020-09-16 11:58:01 -07:00
WhizSid
c334da1952 Multi git executable paths (#85954) 
* Multi git executable path

* update `git.path` setting description

* 💄

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2020-09-10 15:02:37 +02:00
Vyacheslav Pukhanov
663810e275 Adds commands for --no-verify commit variants (#106335) 
* add `{allow,confirm}NoVerifyCommit`  options

* adds commit comands with no verify

* handles no verify command variants

* handle no verify commit option

* only display no verify variants when option is set
 2020-09-10 11:14:28 +02:00
sneakyfish5.sneaky@gmail.com
ff8d4feeb4 Git: Add cherryPick command 2020-08-09 16:51:37 -05:00
João Moreno
1ab3137674 git: PushErrorHandler 2020-07-15 15:52:31 +02:00
Eric Amodio
561f5b6d26 Remove eslint disable -- #101978 2020-07-09 22:47:42 -04:00
João Moreno
96e3e0f05f hide git rev-parse --show-toplevel 2020-07-06 09:49:11 +02:00
Daniel Davis
3f90d90ab2 Adding .git/SQUASH_MSG detection to commit message autofill 2020-06-26 12:35:32 +01:00
Fedor Nezhivoi
314b58c8e1 switch to use iconv-lite-umd for #79275 (#100472) 
Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
 2020-06-18 16:08:17 +02:00
João Moreno
159bc687ca fix regex 2020-06-11 17:29:12 +02:00
João Moreno
3cc8685501 fixes #24883 2020-06-11 11:36:57 +02:00
Alex Ross
92164dd93d Add a pattern to the git BranchQuery (#99681) 
* Add a pattern to the git BranchQuery

* Add count, which makes getting refs even faster

* Update order of args in getRefs to match for-each-ref doc
 2020-06-10 13:51:00 +02:00
Asif Hasan
df3af97279 fix fetchOnPull behavior for Sync 2020-06-03 18:23:37 -05:00
João Moreno
8cce062aaf 💄 2020-05-27 15:27:13 +02:00
rzj17
60d906fd57 Modify git add/revert to use splitInChunks 2020-05-23 18:13:55 +01:00
Alex Ross
6570efce0f Add git extension API for branches (#97621) 
Enables microsoft/vscode-pull-request-github#1781
 2020-05-14 12:26:50 +02:00
Alex Ross
3da22e920b Add path to LogOptions (#97693) 
Part of microsoft/vscode-pull-request-github#1781
 2020-05-13 16:04:28 +02:00
kingwl
8561cbb8ae Add force checkout and smart checkout 2020-05-12 00:36:28 +08:00
kingwl
b24cb8b47d Add rename by git context menu 2020-05-11 19:01:45 +08:00
Ladislau Szomoru
ee8a6bc4f8 Git: Add "git rebase --abort" command (#97071) 
Add "git rebase --abort" command
 2020-05-07 14:26:55 +02:00
João Moreno
cab6f958a2 git extension api: registerCredentialsProvider 2020-04-24 18:04:36 +02:00
João Moreno
888f89b40a add renameRemote 2020-04-23 14:37:39 +02:00
Anthony Van de Gejuchte
bf9146eaf0 User 'cat' as GIT_PAGER option 2020-04-20 15:11:05 +02:00
Anthony Van de Gejuchte
057500153b Move env declaration of GIT_PAGER 2020-04-20 14:13:34 +02:00
Eric Amodio
77e79529e1 Removes bogus code 2020-04-16 11:48:34 -04:00
Eric Amodio
9640830490 Fixes #94882 -- checks for trailing \ & protects 
if somehow `networkPath` had a trailing \, it would cause this behavior
 2020-04-10 15:14:14 -04:00
Eric Amodio
a096bae36c Switches to use realpath.native instead of wmic 2020-03-25 16:34:52 -04:00
Eric Amodio
68e7b61f91 Fixes #91548 - git 2.25+ network drive issue 
On Git 2.25+ if you call rev-parse --show-toplevel on a mapped drive, instead of getting the mapped drive path back, you get the UNC path for the mapped drive.

So we will try to normalize it back to the mapped drive path if possible
 2020-03-25 03:31:55 -04:00
Eric Amodio
3f6843956a Refactors timeline to work better w/ multi sources 
Separates the tree rendering from the data model cache
Fixes many issues and simplifies the code
 2020-03-20 04:00:52 -04:00
Eric Amodio
d46c8a8c3c Lots of timeline related changes, below 
UI:
Adds Refresh icon to view title
Adds "Load more" entry at the end of the list for paging

API:
Restructures api around cursors
Renames TimelineCursor to generic TimelineOptions for more flexibility
Adds paging object to Timeline for clearer paging usage
Changes cursors to be strings, and explicit before and after cursors
Allows limit to take a cursor, so we can reload current data set
Clarifies id and fallback to timestamp
Adds reset flag to TimelineChangeEvent for providers to reset caching

Git provider:
Orders and returns commit date as the timestamp
Supports limit of a cursor (using rev-list --count)
Stops returning working/index changes when paging
Forcably resets cached data when changes are detected (naive for now)
 2020-02-24 15:48:37 -05:00
Joao Moreno
fe884b305e Revert "Revert "Fix #88294 Add commitData in commit interface"" 
This reverts commit aa70f38ab2.
 2020-02-18 12:56:07 +01:00
Alex Dima
aa70f38ab2 Revert "Fix #88294 Add commitData in commit interface" 
This reverts commit 51b8bd5064.
 2020-02-18 12:48:22 +01:00
Jiayue. Zhang
ee6278b01e Merge branch 'master' into issue/88294 2020-02-13 00:06:47 +09:00
Eric Amodio
5cb987119a Fixes #90229 2020-02-10 14:52:22 -05:00
Joao Moreno
16c7551f36 move git smoke tests to integration tests 2020-02-04 17:06:49 +01:00
Jiayue. Zhang
b61b242503 Merge branch 'master' into issue/88294 2020-01-31 15:49:40 +09:00
Ben Curtis
33b5a9ba25 Merge branch 'master' into ignore_sub 2020-01-30 13:16:06 -05:00
Joao Moreno
830992d818 fixes #89373 2020-01-30 17:12:15 +01:00
Jiayue Zhang
51b8bd5064 Fix #88294 Add commitData in commit interface 2020-01-30 01:10:05 +09:00
Eric Amodio
44edf3c197 Polishes the timeline UI/UX 
Cleans up API and removes some unused features (e.g. paging)
Adds date formatting
Adds loading progress and message
Removes lots of console.logs 😁
Adds titles to diffs
 2020-01-27 15:28:33 -05:00
Eric Amodio
87c2332fed Adds timeline diff on click and icon support 2020-01-27 15:28:33 -05:00
Fmstrat
d7ed37e864 add ignoreSubmodules option 2020-01-16 09:39:19 -05:00
Joao Moreno
413a17865c git: use getCommit instead of log 2019-11-29 12:31:19 +01:00
Joao Moreno
ba79d4a0ee Merge commit 'refs/pull/82995/head' of github.com:microsoft/vscode into pr/82995 2019-11-29 12:06:41 +01:00
Joao Moreno
f4f0062168 git input box shouldn't handle comments 
related to #84201
 2019-11-21 16:41:35 +01:00
Joao Moreno
3b0571d8c2 cleanup denodeify from git 2019-11-21 16:41:35 +01:00