Commit graph

198 commits

Author SHA1 Message Date
Joao Moreno dde577b23e
activate git before smoke tests 2020-02-05 15:03:05 +01:00
Joao Moreno 06dbb1938f
make sure git is activated before integration tests run 2020-02-05 10:24:47 +01:00
Eric Amodio b861a1143d Removes open diff command from palette 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
Joao Moreno 548baadc5f
git: have own log level
related to #85992
2020-01-27 14:40:24 +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 3bf8e81517
fixes #85205 2019-11-20 16:25:10 +01:00
Joao Moreno fd091abb85
fixes #84274 2019-11-08 15:55:30 +01:00
Joao Moreno ad6011cb7a rename git.untrackedChanges: default to mixed 2019-10-28 10:35:56 +01:00
Joao Moreno 7da96f94c1
cleanup setting name and values 2019-10-25 16:11:36 +02:00
Joao Moreno 82abb9e56d
differentiate between tracked & untracked in staging 2019-10-25 16:01:52 +02:00
Joao Moreno 003177ea90
git.stageAllUntracked, git.cleanAllUntracked 2019-10-25 15:49:38 +02:00
Joao Moreno 94389f776f
fix bad git package.nls.json change 2019-10-25 12:19:35 +02:00
Joao Moreno 1a071b1f79
Merge commit 'refs/pull/80083/head' of github.com:microsoft/vscode into pr/80083 2019-10-25 12:15:59 +02:00
Joao Moreno 1c19031a23
Merge remote-tracking branch 'origin/master' 2019-10-25 11:41:31 +02:00
Joao Moreno 980fb4b0ff
Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +02:00
andrecasal 396dead18b Clarified git.confirmEmptyCommits description 2019-10-24 21:29:07 +01:00
Joao Moreno f402575486 cleanup git delete tag command 2019-10-24 15:27:57 +02:00
Joao Moreno 23a4df3672 Merge commit 'refs/pull/74345/head' of github.com:microsoft/vscode into pr/74345 2019-10-24 15:13:29 +02:00
Joao Moreno 2125bcf9af 💄 2019-10-17 15:52:21 +02:00
Joao Moreno 9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Joao Moreno ced9fdfa4f scm: folder context actions 2019-09-18 11:58:44 +02:00
Jakobeha 966e3fd070
Merge branch 'master' into hide-untracked 2019-08-29 19:12:10 -04:00
jakob 63f6496094 config option to separate or hide untracked files 2019-08-29 17:09:47 -04:00
Greg Van Liew 7ee04f67c7 Update Git count badge description 2019-08-27 12:00:50 -07:00
Xhulio Hasani 32d59ba806 Added quickpick option and display of tag annotation on menu 2019-08-20 16:05:46 -04:00
Joao Moreno 22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno 2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Xhulio Hasani 98ed0fc2e8 Merge branch 'master' of https://github.com/microsoft/vscode 2019-08-11 19:50:41 -04:00
skprabhanjan 1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
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 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +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
Drew Cross 528f5805e7 Updating naming scheme to match other commands 2019-07-10 20:18:15 -07:00
Drew Cross 11a9ac5703 Adding "..." to the end of drop stash 2019-07-03 05:36:10 -07:00
Drew Cross a047914487 Adding git stash drop for issue 76195 2019-06-29 07:19:20 -07:00
Xhulio Hasani 8173fb9a92 Merge branch 'master' of https://github.com/microsoft/vscode 2019-06-28 23:06:25 -04:00
Joao Moreno b485ffb756 fix git nls 2019-06-12 12:02:58 +02:00
Joao Moreno 4a3c056e9a use --follow-tags instead of --tags when pushing
fixes #70081
fixes #75240
2019-06-12 11:06:54 +02:00
Xhulio Hasani c125f8ed7b added deleteTag 2019-05-26 01:20:24 -04:00
Hao Hu 2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Joao Moreno 6824561046 fixes #70812 2019-03-20 09:34:26 +01:00
ipmsteven 4935612fe6 introduce onlyTrackedFilesCanBeAutoStaged feature flag 2019-03-14 23:23:11 -07:00
Josh Leeb-du Toit 05ed3df9b8 Add option to hide git sync button in status bar
This PR adds the option `git.statusBarSync.enabled` which when set to `false`
will hide the `SyncStatusBar` icon that is, by default, visible in the status
bar.
2019-03-15 17:11:32 +11:00
Joao Moreno 9fb1a067b6 Merge branch 'master', commit 'refs/pull/60640/head' of github.com:Microsoft/vscode into pr/60640 2019-03-08 10:07:10 +01:00
Joao Moreno 2f82209adf 💄 cleanup git input validation rules
#60407
2019-01-04 17:03:11 +01:00