Commit Graph

1172 Commits

Author SHA1 Message Date
Joao Moreno 9f65705acf Merge commit 'refs/pull/75295/head' of github.com:microsoft/vscode into pr/75295 2019-08-08 16:56:51 +02:00
Joao Moreno 2c189f373f fix capture group 2019-08-08 16:38:39 +02:00
Joao Moreno daf581da39 fixes #71258 2019-08-08 16:30:47 +02:00
Joao Moreno 0bb4cc3daf remove misdirection 2019-08-08 12:43:01 +02:00
Dan McCarthy 72e3d3b45d Updated branch tooltip to display full branch name instead of "checkout..." (#72275)
Previously the tooltip displayed when hovering over a branch name in the git workflow simply said "Checkout...".

However, this could be better used by displaying the full branch name since long branch names are concatenated and not shown in full. Therefore it has been updated to do so.
2019-08-08 12:28:03 +02:00
Joao Moreno 5481dcca5e Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710 2019-08-08 12:17:46 +02:00
Joao Moreno 6af97c8756 💄 2019-08-08 12:02:55 +02:00
Joao Moreno 273cca4ac8 Merge commit 'refs/pull/70536/head' of github.com:microsoft/vscode into pr/70536 2019-08-08 11:57:25 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
Joao Moreno 3dc34be7ae Merge commit 'refs/pull/70539/head' of github.com:microsoft/vscode into pr/70539 2019-08-08 11:34:18 +02:00
Joao Moreno fa5c79386c git: promptToSaveFilesBeforeCommit should have more options
related to #66296
2019-08-08 11:30:25 +02:00
Joao Moreno f7fd6b34ba git: improve promptToSaveFilesBeforeCommit message 2019-08-08 11:22:52 +02:00
Joao Moreno d69616088c Merge commit 'refs/pull/67953/head' of github.com:microsoft/vscode into pr/67953 2019-08-08 11:22:28 +02:00
Joao Moreno bd30caa0d7 fix git count badge setting change update 2019-08-08 10:38:33 +02:00
Joao Moreno 59e3396c27 use add instead of stage 2019-08-07 17:37:44 +02:00
Joao Moreno 5a40f525bc Merge commit 'refs/pull/69506/head' of github.com:microsoft/vscode into pr/69506 2019-08-07 17:35:21 +02:00
João Moreno 555693ca34 Merge pull request #75213 from Olovan/master
Fix #72640
2019-08-07 17:30:15 +02:00
Joao Moreno 8a2819be58 fixes #66620 2019-08-07 12:18:44 +02:00
João Moreno b8a8085ad1 Merge branch 'master' into rievans/gitpushbranchwithsymbolfail 2019-08-07 11:51:55 +02:00
Joao Moreno 3f4b96732c fixes #78541 2019-08-07 11:41:21 +02:00
Joao Moreno 21a4e91688 cleanup 2019-08-06 18:28:33 +02:00
Joao Moreno a6177d979a cleanup for pr #66095 2019-08-06 17:49:42 +02:00
Joao Moreno c769d8a08a Merge commit 'refs/pull/66095/head' of github.com:microsoft/vscode into pr/66095 2019-08-06 16:57:22 +02:00
Joao Moreno 797bd786ac Merge commit 'refs/pull/65906/head' of github.com:microsoft/vscode into pr/65906 2019-08-06 16:44:25 +02:00
Joao Moreno a39b7f23aa Merge commit 'refs/pull/65247/head' of github.com:microsoft/vscode into pr/65247 2019-08-06 16:41:02 +02:00
Joao Moreno 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
Joao Moreno 3bbbad38c1 💄 2019-08-06 13:53:34 +02:00
Joao Moreno c30ae90a9c Merge commit 'refs/pull/78504/head' of github.com:microsoft/vscode into pr/78504 2019-08-06 13:52:15 +02:00
João Moreno a3984f7371 Merge pull request #63743 from mIkhail-zaretsky/disable-smart-commit
'suggestSmartCommit' configuration setting was introduced
2019-08-05 17:29:53 +02:00
João Moreno 721385ff4d Merge branch 'master' into gitcloneissue 2019-08-05 17:08:13 +02:00
Howard Hung 0d5596bbc3 Feat. #77878 - trim git clone 2019-08-05 22:07:19 +08:00
Joao Moreno a154f8f451 fixes #77345 2019-07-26 15:33:35 +02:00
Joao Moreno 8213baf076 extract first repository.status call
related to https://github.com/microsoft/vscode/issues/77787#issuecomment-515207062
2019-07-26 14:37:33 +02:00
Joao Moreno 23d8322547 introduce git APIState
fixes #77787
2019-07-25 15:38:10 +02:00
Joao Moreno 752e204839 more disclaimers
related to #76993
2019-07-23 11:48:19 +02:00
Pine Wu d44f9dae34 Use array of string for applicable builtin settings 2019-07-17 15:07:31 -07:00
Joao Moreno 18d7ce89b7 fixes #76556 2019-07-04 08:58:37 +02:00
sharkykh b378c5cc8c Put current git branch name as value when renaming (#72957)
* Put current git branch name as value when renaming

* Simplify code
2019-07-03 09:15:07 +02:00
Xhulio Hasani b462757eb6 HEAD label appears on tab (#76329) 2019-07-03 09:12:32 +02:00
Miguel Solorio e543c32295 Merge master 2019-07-01 07:46:03 -07:00
Alex Ross a570522203 Update grammars
Also added a test for an existing c++ syntax highlighting issue.
2019-07-01 16:39:15 +02:00
Miguel Solorio 05ee90f7fd Merge remote-tracking branch 'origin/master' into misolori/new-icons 2019-06-28 11:05:33 -07:00
Miguel Solorio efaf262c84 Update icons 2019-06-28 09:31:57 -07:00
Prabhanjan S Koushik 997ee7cf79 Removed uppercase styling and explicity added in SCM (#76286) 2019-06-28 16:42:41 +02:00
Miguel Solorio 9f7dd28e6d Update icons 2019-06-26 15:46:15 -07:00
Joao Moreno c7b6044d0f fix bad watch 2019-06-25 11:40:46 +02:00
Patrick Burke f0614b0e24 Show head label in placeholder of commit message 2019-06-24 16:17:51 +02:00
Joao Moreno 7b1a326985 fixes #75753 2019-06-24 15:06:03 +02:00
Miguel Solorio b25f96a60a Update all icons 2019-06-20 11:41:07 -07:00
Joao Moreno 997e91421e add diagnostic tool for git file event issues 2019-06-20 15:47:46 +02:00