Commit Graph

87 Commits

Author SHA1 Message Date
Bjarke Sporring
988ce3bc92 fix: remove subproject "challenge" folders 2026-01-15 14:31:30 +01:00
Bjarke Sporring
9fbdd941fa feat: check for mainbranch 2026-01-15 14:31:00 +01:00
Bjarke Sporring
40341d21a7 fix: add suggestion for a new file for branching and merging 2026-01-15 14:30:08 +01:00
Bjarke Sporring
8a82253fc2 fix: add better explanation of merges 2026-01-15 14:22:11 +01:00
Bjarke Sporring
f0522e14bc feat: setup merge and diff for git 2026-01-15 14:07:25 +01:00
Bjarke Sporring
0183a06134 feat: set git defaultBranch to main 2026-01-15 13:55:55 +01:00
Bjarke Sporring
c3d9d3337c refactor: add better instructions for branching and merging 2026-01-15 13:47:30 +01:00
Bjarke Sporring
ced65740a3 fix: naming of main branch write host 2026-01-15 13:16:34 +01:00
Bjarke Sporring
bf07cb1868 refactor: check for main branch 2026-01-15 13:14:38 +01:00
Bjarke Sporring
7b638d27de refactor: we're breaking out merge-conflicts 2026-01-15 12:51:43 +01:00
Bjarke Sporring
ea5cbccc75 refactor: simplify the multiplayer part of Git 2026-01-15 12:04:20 +01:00
Bjarke Sporring
76c4182186 feat: update README to include SSH guidelines 2026-01-15 12:03:50 +01:00
Bjarke Sporring
5b4c544fee feat: add a WHAT-IS-GIT file that describes the essentials of what GIT is 2026-01-15 12:03:12 +01:00
Bjarke Sporring
74a23dbbca feat: add commit message best practices 2026-01-15 12:02:25 +01:00
Bjarke Sporring
25077cd589 feat: add a simple best practices for when working together 2026-01-15 12:02:13 +01:00
Bjarke Sporring
8b3ba808d1 feat: add azure devops ssh setup guidelines 2026-01-15 12:01:23 +01:00
Bjarke Sporring
9e03a9624a fix: verification of answers for history 2026-01-15 12:01:07 +01:00
Bjarke Sporring
b2b8a2cfff feat: make the steps more explicit 2026-01-15 11:45:58 +01:00
Bjarke Sporring
7e2f8d64fb refactor: simplify user choice. Install and clone split 2026-01-15 10:29:34 +01:00
Bjarke Sporring
eadf8cfe6a fix: version checks 2026-01-15 10:23:15 +01:00
Bjarke Sporring
9e22f84a53 fix: init of prereqs 2026-01-15 10:14:15 +01:00
Bjarke Sporring
daa787842a fix: remove the statement? 2026-01-15 10:11:40 +01:00
Bjarke Sporring
a392e8c97d feat: add a "what do you want" step 2026-01-15 10:09:11 +01:00
Bjarke Sporring
009a3a9104 fix: proper version formatting for install version check 2026-01-15 10:03:21 +01:00
Bjarke Sporring
32a0e89f72 fix: let's just try to find a version inside the version string 2026-01-15 09:55:54 +01:00
Bjarke Sporring
91c46718c6 fix: version regex for git and other semver stuff 2026-01-14 17:48:57 +01:00
Bjarke Sporring
c99e238814 fix: version match 2026-01-14 17:42:40 +01:00
Bjarke Sporring
2633ee2b71 Add clear terminal opening guidance for VSCode
- Enhance instructions for opening integrated terminal in VSCode
- Provide multiple methods: Ctrl+backtick, menu, and Command Palette
- Add visual separation with headers for important information
- Emphasize that terminal opening is REQUIRED for next steps
- Include detailed fallback instructions if VSCode command fails
- Make terminal guidance impossible to miss with multiple clear options
- Remove ambiguity about how to access terminal in VSCode
2026-01-14 17:29:22 +01:00
Bjarke Sporring
c28151cc19 Fix version parsing in Install-Package for Windows Git format
- Update regex to extract only semantic version numbers (x.y.z)
- Prevents matching entire string like '2.52.0.windows.1'
- Uses '^(\d+(?:\.\d+){1,2})' to match version at start of string only
- Extracts '2.52.0' from '2.52.0.windows.1' for proper version comparison
- Handles Windows Git version suffixes correctly
- Maintains compatibility with standard version formats
2026-01-14 17:24:33 +01:00
Bjarke Sporring
07faa14b7a Remove Python installation and add one-shot install instructions
- Remove all Python-related installation logic since Module 08 is Git-only
- Update synopsis to mention repository cloning capability
- Add one-shot installation instructions using Invoke-RestMethod
- Remove Python from results tracking, installation prompts, and verification
- Simplify installation summary without Python references
- Update examples to show both one-shot and local execution methods
2026-01-14 17:12:03 +01:00
Bjarke Sporring
09f25d6eae Add repository cloning and VSCode opening to install.ps1
- Ask user if they want to clone workshop to Documents/git-workshop
- Automatically clone repository to Documents folder for convenience
- Open VSCode in the workshop directory after cloning
- Handle existing repositories (update if already cloned)
- Provide quick start commands for VSCode terminal
- Fallback to manual instructions if user declines or cloning fails
- Complete end-to-end setup experience
2026-01-14 17:03:04 +01:00
Bjarke Sporring
cbefeaf4d2 refactor: move install-prerequisites to install.ps1 2026-01-14 17:00:02 +01:00
Bjarke Sporring
7066e648d5 refactor: do not exit on script finish 2026-01-14 16:57:54 +01:00
Bjarke Sporring
14cfc2feeb Fix Git version check to handle Windows formatting
- Update Test-GitVersion to properly parse Git versions with Windows suffixes
- Handle formats like '2.52.0.windows.1' correctly
- Parse major and minor version numbers separately for accurate comparison
- Now correctly identifies versions 2.23+ regardless of Windows-specific suffixes
- Add better error message when version parsing fails
2026-01-14 16:56:29 +01:00
Bjarke Sporring
734b49bc7d Add user confirmation for PowerShell 7 terminal integration
- Ask user before setting PowerShell 7 as default VSCode terminal
- Make PowerShell terminal setup recommended but optional
- Add separate tracking for terminal integration result
- Update installation summary to show configuration status
- Provide clearer feedback on what was configured
2026-01-14 16:53:25 +01:00
Bjarke Sporring
985c4a0a8a Remove GitLens and GitGraph extensions from VSCode setup
- Keep only essential PowerShell extension and PowerShell 7 integration
- Simplify VSCode setup to focus on core requirements
- Reduce installation time and complexity
- Users can install additional Git extensions manually if desired
2026-01-14 16:51:32 +01:00
Bjarke Sporring
f55cb444e7 Add VSCode extensions and PowerShell 7 integration setup
- Added function to install VSCode extensions via command line
- Install PowerShell extension for better PowerShell support in VSCode
- Install GitLens and Git Graph extensions for enhanced Git experience
- Configure VSCode to use PowerShell 7 as default terminal
- Update progress tracking to include extension installation step
- Add extension results to installation summary
2026-01-14 16:49:35 +01:00
Bjarke Sporring
6d2e099eb4 Add progress bars to install-prerequisites.ps1
- Added overall progress tracking for required installations (1/3, 2/3, 3/3)
- Added progress indicators for optional installations
- Added individual package installation progress with status updates
- Progress bars show clear visual feedback during installation process
- Helps users understand how far along the installation is
2026-01-14 16:37:39 +01:00
Bjarke Sporring
f696044461 Simplify README installation instructions
- Remove complex installation options
- List prerequisites with direct winget commands
- Keep oneshot installation as recommended option
- Add manual setup steps for clarity
- Focus on getting users started quickly
2026-01-14 16:35:59 +01:00
Bjarke Sporring
e7ce41cbbc Update oneshot installation to clone repository locally
- Modified install.ps1 to clone git-workshop repository to ~/git-workshop
- Added option to remove existing directory before cloning
- Updated documentation to reflect the new behavior
- Now provides complete setup: install tools + clone repo in one command
- Similar to Scoop's get.scoop.sh installation pattern
2026-01-14 16:29:09 +01:00
Bjarke Sporring
34f2607b22 Add oneshot installation script for easy setup
- Created install.ps1 that downloads repository and runs prerequisites installer
- Updated README.md and INSTALLATION.md to document the new oneshot option
- Script can be run with: irm https://git.frod.dk/floppydiscen/git-workshop/raw/branch/main/install.ps1 | iex
- Provides seamless installation experience for new users
2026-01-14 16:26:29 +01:00
Bjarke Sporring
bb01592b6c feat: initial install-prerequisites script that install vscode, git and powershell 7 2026-01-12 08:50:41 +01:00
Bjarke Sporring
5492f17a5a fix: cleanup README and focus on windows 2026-01-12 08:42:20 +01:00
Bjarke Sporring
5f78245734 refactor: rename 01_essentials to 01-essentials 2026-01-11 23:05:03 +01:00
Bjarke Sporring
8d63b2d22e feat: split out reset from the revert. First the safe path then the advanced path 2026-01-11 23:02:48 +01:00
Bjarke Sporring
039debe744 fix: remove accidental subproject addition 2026-01-11 14:52:36 +01:00
Bjarke Sporring
a0a9a5a0d9 feat: initial branching+merge+conflicts module merge 2026-01-11 14:50:40 +01:00
Bjarke Sporring
0a9f7c1842 feat: update README after big changes 2026-01-07 23:51:49 +01:00
Bjarke Sporring
7f34cf2d08 feat: add multiplayer guidelines 2026-01-07 23:46:32 +01:00
Bjarke Sporring
eb63970b7a feat: make merge-conflicts more explicit 2026-01-07 23:03:18 +01:00