Update options when installing Git, update script, and update ExecutionPolicy

Author: bakgaard

GitSetup.ps1

@@ -89,7 +89,6 @@ function DownloadGit
 	{
 		$text = @"
 `$env:path += ";" + (Get-Item "Env:ProgramFiles").Value + "\Git\bin"
-`$env:path += ";" + (Get-Item "Env:ProgramFiles").Value + "\Git\cmd"
 `$env:home = `$env:userprofile
 
 #Alias
@@ -107,7 +106,6 @@ Start-Service ssh-agent
 	{
 		$text = @"
 `$env:path += ";" + (Get-Item "Env:ProgramFiles").Value + "\Git\bin"
-`$env:path += ";" + (Get-Item "Env:ProgramFiles").Value + "\Git\cmd"
 `$env:path += ";" + (Get-Item "Env:ProgramFiles").Value + "\Git\usr\bin"
 `$env:home = `$env:userprofile
  

README.md

@@ -1,29 +1,37 @@
 # GitSetup
-This repository will setup Git for shell warriors. 
+
+This repository will setup Git for shell warriors.
 It includes setup of Posh-git, P4Merge, and several shortcuts.
 
+## Step 1 - Installing Git
 
-## Step 1 - Installing Git:
 * Download Git from the following link:
-	https://git-for-windows.github.io/
+ <https://git-for-windows.github.io/>
 * Install it with the following parameters:
-	* Check the following under 'Selected Components', and uncheck everything else unless needed
-		* Git LFS
-		* Use a TrueType font in all console windows
-	* Select your preferred option of the three editors
-		* **It will be overridden when this tutorial is done**
-	* Select the following radio button under 'Adjusting your PATH environment'
-		* Use Git from the Windows Command Prompt
-	* Select the following radio button under 'HTTPS transport backend'
-		* Use the OpenSSL library
-	* Select the following radio button under 'Configuring the line ending conversions'
-		* Checkout as-is, commit as-is
-	* Select the following radio button under 'Configuring the terminal emulator to use with Git Bash'
-		* Use Windows' default console window
-	* The check boxes under 'Configuring extra options' are optional
-
-
-## Step 2 - Running the script:
+  * Check the following under 'Selected Components', and uncheck everything else unless needed
+    * Git LFS
+    * Associate .git* configuration files with the default text editor
+    * Check daily for Git for Windows updates
+    * Add a Git Bash Profile to Windows Terminal
+  * Select your preferred option of the three editors
+  * **It will be overridden when this tutorial is done**
+  * **Adjusting your PATH environment**:
+    * Git from the command line and also from 3rd-party software
+  * **Choosing the SSH executable**:
+    * Use bundled OpenSSH
+  * **HTTPS transport backend**:
+    * Use the OpenSSL library
+  * **Configuring the line ending conversions**:
+    * Checkout as-is, commit as-is
+  * **Configuring the terminal emulator to use with Git Bash**:
+    * Use Windows' default console window
+  * **Choose the default behavior of `git pull`**
+    * Fast-forward or merge
+  * **Choose a credential helper**
+    * Git Credential Manager
+  * The check boxes under 'Configuring extra options' are optional
+
+## Step 2 - Running the script
 
 * Open PowerShell in **Administrator mode**:
 
@@ -36,15 +44,15 @@ $Folderpath = ".\GitSetup" #Current location in a folder called "GitSetup"
 
 # Download data from he Git repository
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-Invoke-WebRequest -URI https://github.com/bakgaard/GitSetup/archive/master.zip -OutFile "$Folderpath.zip"
+Invoke-RestMethod -Uri https://github.com/bakgaard/GitSetup/archive/master.zip -OutFile "$Folderpath.zip"
 
 # Unzip the files
 Expand-Archive "$Folderpath.zip" -DestinationPath $Folderpath -Force
 
 cd "$Folderpath/GitSetup-master"
 
 # Setup PowerShell for Git
-Set-ExecutionPolicy RemoteSigned -Scope Process -Confirm -Force
+Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Confirm -Force
 ./GitSetup $YourName $YourEmail
 
 # Clean up .zip-file and extracted folder
@@ -53,7 +61,6 @@ rm "$Folderpath.zip"
 rmdir $Folderpath -Recurse -Force
 ```
 
-
 ### Step 3 - Fix mergetool error
 
 You will most likely encounter a merge tool error, which might be because you are missing ``msvcr110.dll``.
@@ -63,14 +70,10 @@ Download and install the [Visual C++ Redistributable for Visual Studio 2013](htt
 choco install vcredist2013 -y
 ```
 
-
-
-
 ## Errors
 
 This is not perfect, so you might encounter an error or two:
 
-
 ### Can't run .ps1-script
 
 This happens, and I can't really find the root cause, but I have a work-around:
@@ -79,7 +82,6 @@ This happens, and I can't really find the root cause, but I have a work-around:
 * Copy everything to a new document, and save it as ``setup.ps1``
 * Run ``setup.ps1 "Your name" "Your email"``
 
-
 ## Git cheat sheet
 
 | **Simple operations** | **Full command** | **Alias version** |
@@ -91,7 +93,7 @@ This happens, and I can't really find the root cause, but I have a work-around:
 | Fetch (peak) the latest changes | ``git fetch`` | ``g ft`` |
 | Pull the latest changes | ``git pull`` | ``g pl`` |
 | Show the status as a one-liner | ``git status -s`` | ``g ss`` |
-| | |
+| | | |
 | **Branches and merges** | **Full command** | **Alias version** |
 | Create branch | ``git branch BranchName`` | ``g br BranchName`` |
 | Checkout / switch branch | ``git checkout ExistingBranchName`` | ``g co ExistingBranchName`` |
@@ -101,7 +103,7 @@ This happens, and I can't really find the root cause, but I have a work-around:
 | See branch tree | ``git log --graph --pretty=format...`` | ``g lg`` |
 | See remote branches | ``git branch -r`` | ``g br -r`` |
 | Clean up deleted branches | ``git fetch -p`` | ``g ft -p`` |
-| | |
+| | | |
 | **Undo operations** | **Full command** | **Alias version** |
 | Remove all pending changes | ``git checkout .`` | ``g co .`` |
 | Rollback everything to last commit | ``git reset --hard HEAD^`` |   |