floppydiscen/git-workshop
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Commit Graph

  • c20041efde fix: stash tasks in readme main Bjarke Sporring 2026-01-21 12:57:53 +01:00
  • 84ed357feb fix: pwsh doesn't like @{} since it's a pwsh hashtable. Should wrap in a string Bjarke Sporring 2026-01-21 12:54:14 +01:00
  • 9659d82d2a feat: add a FAQ section Bjarke Sporring 2026-01-21 12:27:09 +01:00
  • dbba2da5f2 tweak(cherry-pick): be more explicit with usage of ls Bjarke Sporring 2026-01-21 12:12:59 +01:00
  • 1d0003bb70 refactor(cherry-pick): more ls commands to check content of challenge when switching branches Bjarke Sporring 2026-01-21 12:08:13 +01:00
  • 3a4fe8ce9e tweak: expand upon some explanations Bjarke Sporring 2026-01-21 11:56:56 +01:00
  • 13dd2317f9 cleanup: pathing issues Bjarke Sporring 2026-01-21 11:56:31 +01:00
  • cac03b69e3 fix: cleanup debug Write-Hosts Bjarke Sporring 2026-01-21 11:41:10 +01:00
  • 19cf66e23d fix: consistent Git naming and explanations for some commands Bjarke Sporring 2026-01-21 11:40:44 +01:00
  • a6b33a441e feat: add a "remember to save" hint Bjarke Sporring 2026-01-21 11:40:22 +01:00
  • 690b83cead fix: remove fallbacks for the Get-MainBranch check Bjarke Sporring 2026-01-21 11:40:00 +01:00
  • c69b463f84 fix: proper check when verifying a merge Bjarke Sporring 2026-01-21 11:39:30 +01:00
  • 39d8ace75c fix: consistent naming of files Bjarke Sporring 2026-01-21 10:53:35 +01:00
  • 4b9d2449c8 refactor: use the new utils.ps1 script for operations Bjarke Sporring 2026-01-21 10:51:59 +01:00
  • 5582b9fcbd refactor: reorder intro files Bjarke Sporring 2026-01-21 10:51:34 +01:00
  • 3a6eb0646b feat: add util.ps1 script for common operations Bjarke Sporring 2026-01-21 10:51:07 +01:00
  • a898030a9f fix: use git stash push instead of git stash save which is deprecated Bjarke Sporring 2026-01-18 09:27:12 +01:00
  • 382a125076 fix: add install instructions Bjarke Sporring 2026-01-16 12:43:11 +01:00
  • d80fa74af9 refactor: move the installation description to the README.md Bjarke Sporring 2026-01-16 12:40:49 +01:00
  • 7fc0c1342a refactor: cleanup root readme Bjarke Sporring 2026-01-16 12:36:40 +01:00
  • cba2d9bb16 chore: cleanup Bjarke Sporring 2026-01-16 12:15:11 +01:00
  • 968a44f9a5 fix: cleanup some explanations Bjarke Sporring 2026-01-16 12:11:03 +01:00
  • c39573573f fix: remove mention of rebase Bjarke Sporring 2026-01-16 11:13:11 +01:00
  • ee67433fdd refactor: minor cleanup and expanding explanations for multiplayer Bjarke Sporring 2026-01-16 11:12:53 +01:00
  • 100e89b23d refactor: update docs for the install.ps1 script Bjarke Sporring 2026-01-16 10:26:02 +01:00
  • b58080b8e8 Merge pull request 'refactor-reset-revert' (#3) from refactor-reset-revert into main floppydiscen 2026-01-16 09:19:41 +00:00
  • 6cf0418ebd fix: remove references to git reset refactor-reset-revert Bjarke Sporring 2026-01-16 10:18:46 +01:00
  • a8e9507f89 fix: missing images for ssh setup Bjarke Sporring 2026-01-15 18:30:52 +01:00
  • 2240cbe10d Merge pull request 'refactor-reset-revert' (#1) from refactor-reset-revert into main floppydiscen 2026-01-15 16:32:19 +00:00
  • a895abdd03 feat: drastically simplify tasks for multiplayer Bjarke Sporring 2026-01-15 17:30:03 +01:00
  • e2e36690ea Revert "refactor: remove advanced for now" advanced-commands Bjarke Sporring 2026-01-15 17:29:41 +01:00
  • 356b6268ba refactor: remove advanced for now Bjarke Sporring 2026-01-15 17:27:35 +01:00
  • bd69774191 feat: drastically simplify the multiplayer module Bjarke Sporring 2026-01-15 17:25:33 +01:00
  • fcaf97f60b refactor: simplify the multiplayer part Bjarke Sporring 2026-01-15 17:03:51 +01:00
  • 2a5eb137f6 fix: stash challenge Bjarke Sporring 2026-01-15 16:42:45 +01:00
  • b0d2d43c8b fix: stash issues Bjarke Sporring 2026-01-15 16:37:57 +01:00
  • cdd695b250 fix: cleanup revert module Bjarke Sporring 2026-01-15 16:29:06 +01:00
  • 0474a6de0e fix: remove revert-middle challenge Bjarke Sporring 2026-01-15 16:23:32 +01:00
  • 575e083f33 refactor: rewrite the merge-revert section Bjarke Sporring 2026-01-15 16:11:24 +01:00
  • aa24c50b45 fix: revert conflict Bjarke Sporring 2026-01-15 15:50:54 +01:00
  • 939bd397f1 refactor: move 08 down a step Bjarke Sporring 2026-01-15 15:42:05 +01:00
  • 3130874981 fix: cleanup cherry-picking tasks and tips Bjarke Sporring 2026-01-15 15:41:21 +01:00
  • a34b7d155f refactor: move reset to advanced Bjarke Sporring 2026-01-15 15:22:45 +01:00
  • 1c20a06c21 fix: cherry-pick conflict Bjarke Sporring 2026-01-15 15:20:32 +01:00
  • 988ce3bc92 fix: remove subproject "challenge" folders Bjarke Sporring 2026-01-15 14:31:30 +01:00
  • 9fbdd941fa feat: check for mainbranch Bjarke Sporring 2026-01-15 14:31:00 +01:00
  • 40341d21a7 fix: add suggestion for a new file for branching and merging Bjarke Sporring 2026-01-15 14:30:08 +01:00
  • 8a82253fc2 fix: add better explanation of merges Bjarke Sporring 2026-01-15 14:22:11 +01:00
  • f0522e14bc feat: setup merge and diff for git Bjarke Sporring 2026-01-15 14:07:25 +01:00
  • 0183a06134 feat: set git defaultBranch to main Bjarke Sporring 2026-01-15 13:55:55 +01:00
  • c3d9d3337c refactor: add better instructions for branching and merging Bjarke Sporring 2026-01-15 13:47:30 +01:00
  • ced65740a3 fix: naming of main branch write host Bjarke Sporring 2026-01-15 13:16:34 +01:00
  • bf07cb1868 refactor: check for main branch Bjarke Sporring 2026-01-15 13:14:38 +01:00
  • 7b638d27de refactor: we're breaking out merge-conflicts Bjarke Sporring 2026-01-15 12:51:43 +01:00
  • ea5cbccc75 refactor: simplify the multiplayer part of Git Bjarke Sporring 2026-01-15 12:04:20 +01:00
  • 76c4182186 feat: update README to include SSH guidelines Bjarke Sporring 2026-01-15 12:03:50 +01:00
  • 5b4c544fee feat: add a WHAT-IS-GIT file that describes the essentials of what GIT is Bjarke Sporring 2026-01-15 12:03:12 +01:00
  • 74a23dbbca feat: add commit message best practices Bjarke Sporring 2026-01-15 12:02:25 +01:00
  • 25077cd589 feat: add a simple best practices for when working together Bjarke Sporring 2026-01-15 12:02:13 +01:00
  • 8b3ba808d1 feat: add azure devops ssh setup guidelines Bjarke Sporring 2026-01-15 12:01:23 +01:00
  • 9e03a9624a fix: verification of answers for history Bjarke Sporring 2026-01-15 12:01:07 +01:00
  • b2b8a2cfff feat: make the steps more explicit Bjarke Sporring 2026-01-15 11:45:58 +01:00
  • 7e2f8d64fb refactor: simplify user choice. Install and clone split Bjarke Sporring 2026-01-15 10:29:34 +01:00
  • eadf8cfe6a fix: version checks Bjarke Sporring 2026-01-15 10:23:15 +01:00
  • 9e22f84a53 fix: init of prereqs Bjarke Sporring 2026-01-15 10:14:15 +01:00
  • daa787842a fix: remove the statement? Bjarke Sporring 2026-01-15 10:11:40 +01:00
  • a392e8c97d feat: add a "what do you want" step Bjarke Sporring 2026-01-15 10:09:11 +01:00
  • 009a3a9104 fix: proper version formatting for install version check Bjarke Sporring 2026-01-15 10:03:21 +01:00
  • 32a0e89f72 fix: let's just try to find a version inside the version string Bjarke Sporring 2026-01-15 09:55:54 +01:00
  • 91c46718c6 fix: version regex for git and other semver stuff Bjarke Sporring 2026-01-14 17:48:57 +01:00
  • c99e238814 fix: version match Bjarke Sporring 2026-01-14 17:40:57 +01:00
  • 2633ee2b71 Add clear terminal opening guidance for VSCode Bjarke Sporring 2026-01-14 17:29:22 +01:00
  • c28151cc19 Fix version parsing in Install-Package for Windows Git format Bjarke Sporring 2026-01-14 17:24:33 +01:00
  • 07faa14b7a Remove Python installation and add one-shot install instructions Bjarke Sporring 2026-01-14 17:12:03 +01:00
  • 09f25d6eae Add repository cloning and VSCode opening to install.ps1 Bjarke Sporring 2026-01-14 17:03:04 +01:00
  • cbefeaf4d2 refactor: move install-prerequisites to install.ps1 Bjarke Sporring 2026-01-14 17:00:02 +01:00
  • 7066e648d5 refactor: do not exit on script finish Bjarke Sporring 2026-01-14 16:57:23 +01:00
  • 14cfc2feeb Fix Git version check to handle Windows formatting Bjarke Sporring 2026-01-14 16:56:29 +01:00
  • 734b49bc7d Add user confirmation for PowerShell 7 terminal integration Bjarke Sporring 2026-01-14 16:53:25 +01:00
  • 985c4a0a8a Remove GitLens and GitGraph extensions from VSCode setup Bjarke Sporring 2026-01-14 16:51:32 +01:00
  • f55cb444e7 Add VSCode extensions and PowerShell 7 integration setup Bjarke Sporring 2026-01-14 16:49:35 +01:00
  • 6d2e099eb4 Add progress bars to install-prerequisites.ps1 Bjarke Sporring 2026-01-14 16:37:39 +01:00
  • f696044461 Simplify README installation instructions Bjarke Sporring 2026-01-14 16:35:59 +01:00
  • e7ce41cbbc Update oneshot installation to clone repository locally Bjarke Sporring 2026-01-14 16:29:09 +01:00
  • 34f2607b22 Add oneshot installation script for easy setup Bjarke Sporring 2026-01-14 16:26:29 +01:00
  • bb01592b6c feat: initial install-prerequisites script that install vscode, git and powershell 7 Bjarke Sporring 2026-01-12 08:49:47 +01:00
  • 5492f17a5a fix: cleanup README and focus on windows Bjarke Sporring 2026-01-12 08:42:20 +01:00
  • 5f78245734 refactor: rename 01_essentials to 01-essentials Bjarke Sporring 2026-01-11 23:05:03 +01:00
  • 8d63b2d22e feat: split out reset from the revert. First the safe path then the advanced path Bjarke Sporring 2026-01-11 23:02:48 +01:00
  • 039debe744 fix: remove accidental subproject addition Bjarke Sporring 2026-01-11 14:52:36 +01:00
  • a0a9a5a0d9 feat: initial branching+merge+conflicts module merge Bjarke Sporring 2026-01-11 14:50:10 +01:00
  • 0a9f7c1842 feat: update README after big changes Bjarke Sporring 2026-01-07 23:51:49 +01:00
  • 7f34cf2d08 feat: add multiplayer guidelines Bjarke Sporring 2026-01-07 23:46:32 +01:00
  • eb63970b7a feat: make merge-conflicts more explicit Bjarke Sporring 2026-01-07 23:03:18 +01:00
  • dff82c847c feat: add more commits to the merging challenges Bjarke Sporring 2026-01-07 23:02:55 +01:00
  • c057fd617b fix: use switch and not checkout Bjarke Sporring 2026-01-07 22:04:44 +01:00
  • f48eefee10 refactor: simplify 01_essentials/04-merging Bjarke Sporring 2026-01-07 21:59:21 +01:00
  • df9a2bf7c1 refactor: split out merge strategies from essentials Bjarke Sporring 2026-01-07 21:50:59 +01:00
  • 7fb84560f5 use switch instead of checkout for branches Bjarke Sporring 2026-01-07 21:37:21 +01:00
  • 6b0e84934a feat: split out git blame Bjarke Sporring 2026-01-07 21:12:31 +01:00