Commit Graph

2954 Commits

Author SHA1 Message Date
Joao Moreno
32d22dbace Merge commit 'refs/pull/59988/head' of github.com:Microsoft/vscode into pr/59988 2019-01-04 16:30:25 +01:00
Joao Moreno
507a3508a5 💄 2019-01-04 16:24:14 +01:00
Joao Moreno
579b962ae1 Merge commit 'refs/pull/59974/head' of github.com:Microsoft/vscode into pr/59974 2019-01-04 16:22:03 +01:00
Joao Moreno
dcb3c339c8 preserve user input when creating branch from checkout
fixes #60895
2019-01-04 16:08:12 +01:00
Joao Moreno
133e999097 💄 2019-01-04 15:16:45 +01:00
Joao Moreno
cf107f3c3d Merge commit 'refs/pull/59078/head' of github.com:Microsoft/vscode into pr/59078 2019-01-04 15:02:46 +01:00
Joao Moreno
3a2c97c5d6 refactor autostash behaviour 2019-01-04 14:58:44 +01:00
Joao Moreno
5c8c42e886 remove unnecessary operation run 2019-01-04 14:41:45 +01:00
Joao Moreno
9b88d30734 Merge commit 'refs/pull/59849/head' of github.com:Microsoft/vscode into pr/59849 2019-01-04 14:34:28 +01:00
Rob Lourens
ef2547d547 replace void 0 with undefined 2019-01-03 11:20:19 -08:00
Joao Moreno
fe6e62674c remove 100 change limit 2019-01-03 09:20:20 +01:00
Dan Wood
6208e8441e Clean user input for git clone extension
Strip whitespace and "git clone " from start of string. This will allow
VSCode to intelligently handle copy and paste from command line
instructions being pasted into the clone input box.
2019-01-03 00:10:44 +11:00
Peng Lyu
94a04621dd Fix microsoft/vscode-pull-request-github#612. Allow fetching with limited depths 2018-12-28 12:02:28 -08:00
Joao Moreno
6de43eec8d Merge commit 'refs/pull/59163/head' of github.com:Microsoft/vscode into pr/59163 2018-12-20 12:51:58 +01:00
Joao Moreno
6d31c16989 💄 2018-12-20 12:37:04 +01:00
Joao Moreno
cdb8a86fd0 git ignore: save after apply edit 2018-12-20 11:33:01 +01:00
Joao Moreno
349b0d454e fix git.openDiffOnClick scope 2018-12-20 10:17:26 +01:00
João Moreno
034ff33eb4 Merge pull request #64305 from Microsoft/misolori/open-change-icons
Update "Open changes" icons to better reflect diff changes
2018-12-19 08:43:09 +01:00
Tito
7a69cd07c0 Git sync now publishes branch upon confirmation (#64183 issue fix) 2018-12-18 02:27:38 +00:00
joaorreis
6dbf6b5857 fixed 2018-12-17 14:47:35 +00:00
Ilya Biryukov
01292b4174 Add Git log, globalConfig, and tree diff API 2018-12-11 14:04:34 -08:00
Darrien Singleton
378cd7abd9 Merge branch 'master' into gitcloneissue 2018-12-07 14:16:14 -05:00
Rachel Macfarlane
e27511826f Add GitErrorCode to apply command 2018-12-07 10:21:03 -08:00
Joao Moreno
351905fd53 fixes #63957 2018-12-06 09:43:32 +01:00
Miguel Solorio
7b0677f9dc Update "open change" icons to better reflect the "diff" changes. Uses octicons. 2018-12-04 10:45:27 +01:00
m.zaretski
fe6864f649 'suggestSmartCommit' configuration setting was introduced 2018-11-25 17:32:09 +03:00
Luo Wenqing
a84421bbb3 Merge branch 'master' into fix-branch-checkout 2018-11-25 21:09:46 +08:00
Isidor Nikolic
ec98c79d44 Merge pull request #63497 from Microsoft/isidorn/cgmanifest
Start using component governance for oss tracking
2018-11-20 12:54:47 +01:00
isidor
9edd984da8 delete OSSREADME.json 2018-11-20 12:54:22 +01:00
João Moreno
66f717cfa6 Merge pull request #60104 from mathiasvr/fix-60002
Fix #60002 Undo last commit: keep staged files
2018-11-20 09:59:42 +01:00
Joao Moreno
3af878c2d5 💄 2018-11-20 09:58:01 +01:00
Joao Moreno
6052fcf07f Merge commit 'refs/pull/59735/head' of github.com:Microsoft/vscode into pr/59735 2018-11-20 09:43:16 +01:00
Joao Moreno
e5406b523e introduce git.openDiffOnClick
fixes #63005
2018-11-19 11:54:51 +01:00
Joao Moreno
eb6025ec9b git.postCommitCommand
fixes #62058
2018-11-19 11:54:51 +01:00
Alex Dima
976cfe3aa7 Merge branch 'master' into isidorn/cgmanifest 2018-11-16 17:52:27 +01:00
João Moreno
850bbb275e Merge pull request #63069 from Microsoft/rmacfarlane/gitapi
Expose 'apply' and 'diff --cached' from git extension API
2018-11-16 09:40:04 +01:00
isidor
2ba92aa3e8 add commitHash to cgmanifest 2018-11-15 17:43:46 +01:00
isidor
347fb6347b add all cgmanifests. Still no commitHash 2018-11-14 18:18:25 +01:00
Joao Moreno
237b77bac9 prepare for ts 3.2 2018-11-14 09:29:01 +01:00
Rachel Macfarlane
ad5f5ea365 Expose 'apply' and 'diff --cached' from git extension API 2018-11-13 16:18:37 -08:00
Joao Moreno
d4b84e645f fix #62344 2018-11-12 11:18:58 +01:00
laphets
2376db89b7 Merge from master to resolve a conflict 2018-11-08 23:59:47 +08:00
Rachel Macfarlane
40a6a2db9a Expose force flag for deleting branch on git extension API 2018-11-07 10:48:40 -08:00
OneThatWalks
576182b4fd Merge branch 'master' into gitcloneissue 2018-11-05 20:18:30 -05:00
Joao Moreno
fb9e1da186 update git iconv-lite dependency
fixes #62272
2018-11-05 13:39:47 +00:00
Joao Moreno
2b1d06feb9 fixes #18673 2018-11-01 16:06:38 +01:00
Joao Moreno
50a4525420 fixes #60986 2018-11-01 15:59:42 +01:00
Joao Moreno
349e31fee9 fixes #58918 2018-11-01 15:00:53 +01:00
Joao Moreno
66a49b23da cleaner git push api 2018-11-01 11:11:47 +01:00
Joao Moreno
0aa28f556e Merge commit 'refs/pull/61448/head' of github.com:Microsoft/vscode into pr/61448 2018-11-01 11:09:51 +01:00