Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,037 Commits 3,673 Branches 359 Tags
ee6278b01e9db64004e150c8a27d71e49a3a8577
Commit Graph

493 Commits

Author SHA1 Message Date
Ian MacFarlane
282732392f Clarify language when creating new git branch 
When using the git extension, the intent is clear when clicking on "+ Create new branch..." and immediately being prompted "Please provide a branch name". But, when clicking on "+ Create a new branch from..." the intent is ambiguous, since the statement "Please provide a branch name" could refer to the branch from which you wish to base the new branch on or the name of the new branch, the latter being what actually happens.

By specifying "Please provide a *new* branch name...", the intent is clear: the prompt is asking for the name you wish to call the new branch.
 2020-02-06 13:04:31 -05:00
Eric Amodio
eaf632c42a Adds uncommitted changes to timeline 2020-02-06 00:04:54 -05:00
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
Joao Moreno
16c7551f36 move git smoke tests to integration tests 2020-02-04 17:06:49 +01:00
Joao Moreno
a8231df2ff fixes #88024 2020-01-29 12:39:05 +01:00
Eric Amodio
5c92e3af68 Fixes open diff command (backwards) 2020-01-27 15:28:33 -05: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
2dc90b8140 Adds index (staged changes) to timeline 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
sharkykh
fc824b9da6 Restore "current git branch name when renaming" 2020-01-06 17:08:16 +02:00
Valentin Hăloiu
1ae9ff4cb1 Add parent path to git clone command 2019-11-23 15:38:47 +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
e7e562da3c remove data uri from git 2019-11-21 09:28:23 +01:00
Joao Moreno
fb2f985aa9 git.publish should not ask if only one remote 
related to #84697
 2019-11-20 10:12:31 +01:00
Joao Moreno
e055299e77 fix git commands 2019-11-20 09:37:02 +01:00
Joao Moreno
b6899391cd wip: comment out git data uris 2019-11-19 17:03:15 +01:00
Daniel Imms
a0b9afd1e7 Merge pull request #83795 from microsoft/tyriar/icon_string 
Move icons out of translated strings
 2019-11-04 11:27:38 -08:00
Daniel Imms
3c282d45bd Move icons out of translated strings 2019-10-31 16:02:23 -07:00
Joao Moreno
d651044482 fixes #73613 2019-10-31 19:57:46 +01:00
Joao Moreno
32a529d1ca add modal to undo merge commit 
related to #69937
 2019-10-29 15:40:01 +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
d5e692e758 smart commit should be aware of handleUntracked 2019-10-25 16:06:11 +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
a8b09d4711 fixed scope 2019-10-25 15:14:59 +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
980fb4b0ff Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +02: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
1cd6bd6096 Revert "fixes #71355" 
This reverts commit f0772536de.

Fixes #82797
 2019-10-18 10:23:10 +02:00
João Moreno
fd8383a6b0 Merge pull request #71525 from jmbockhorst/confirmUndoMerge 
Confirm "Undo last commit" if its a merge commit
 2019-10-17 07:01:23 -07:00
Joao Moreno
2125bcf9af 💄 2019-10-17 15:52:21 +02:00
Joao Moreno
1852e0c764 Merge commit 'refs/pull/71434/head' of github.com:microsoft/vscode into pr/71434 2019-10-17 15:35:22 +02:00
Joao Moreno
f901a47197 💄 git clone progress 2019-10-17 14:08:40 +02:00
Joao Moreno
471b263ce5 Merge commit 'refs/pull/71341/head' of github.com:microsoft/vscode into pr/71341 2019-10-17 12:53:45 +02:00
Joao Moreno
d5664e35ed cleanup commit template, merge 
related to #66522
 2019-10-15 17:43:33 +02:00
Joao Moreno
4a80681a01 Merge commit 'refs/pull/66522/head' of github.com:microsoft/vscode into pr/66522 2019-10-15 17:16:42 +02:00
Daniel Imms
dfee0337a5 Merge branch 'master' into fix-executable-bits 2019-10-09 15:16:07 -07:00
Joao Moreno
d1be9d02cd 💄 2019-10-09 12:48:21 +02:00
Joao Moreno
4ce64ef558 Merge commit 'refs/pull/80335/head' of github.com:microsoft/vscode into pr/80335 2019-10-09 12:44:34 +02:00
Joao Moreno
ecea71432f fixes #73613 2019-10-09 12:36:52 +02:00
Joao Moreno
9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Niklas Mollenhauer
1cc0b592c2 Remove executable bits from non-executable files 2019-10-08 15:18:42 +02:00
Dipen Ved
6a0c40a0cc save all and commit fix 2019-09-29 19:55:17 +05:30
al
4afe989cfa 💄 2019-09-08 22:40:11 +03:00
al
4b90d9ba82 Add branch name to commit input box 2019-09-05 00:03:16 +03:00
Jakobeha
966e3fd070 Merge branch 'master' into hide-untracked 2019-08-29 19:12:10 -04:00