From b13f0c6c81e6f8ea63701b64ee9d29d7c8d148dd Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 5 Jul 2022 16:19:47 +1200 Subject: [PATCH] Fix getting-started/install-git.md --- content/getting-started/install-git.md | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/content/getting-started/install-git.md b/content/getting-started/install-git.md index ea643ae..85caa14 100644 --- a/content/getting-started/install-git.md +++ b/content/getting-started/install-git.md @@ -6,21 +6,21 @@ eleventyNavigation: order: 25 --- -Projects on Codeberg use [Git](https://git-scm.com/) as their [version control](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control) system. If you want to contribute source code, it is a good idea to install Git at this point. +Projects on Codeberg use [Git](https://git-scm.com/) as their [version control](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control) system. If you want to contribute source code, it's a good idea to install Git at this point. Git runs on every OS. You can download it directly from the [Git website](https://git-scm.com/downloads), or from your operating system’s package manager (if available). Here we provide step-by-step instructions to install it. -**Disclaimer**: we try to keep these instructions up-to-date, but you might need to adjust them to your machine/OS. +**Disclaimer**: we try to keep these instructions up-to-date, but you might need to adjust them for your machine/OS. ## Linux -On Linux, you can install Git directly from your package manager. Check out [Git's official documentation](https://git-scm.com/download/linux) for the right command for your distro. +On Linux, you can install Git directly from your package manager. Check out [Git's official documentation](https://git-scm.com/download/linux) to get the right command for your distro. Please see also the article [Configuring Git](/git/configuring-git), which describes how to set up your name and email address for Git. ## macOS -There are [several possibilities](https://git-scm.com/download/mac) to install Git on macOS. This guide will show you how to install Git using the Homebrew package manager. You will need to be on macOS High Sierra (10.13) or higher. +There are [several ways](https://git-scm.com/download/mac) to install Git on macOS. This guide will show you how to install Git using the Homebrew package manager. You will need to be on macOS High Sierra (10.13) or higher. ### Install You will first need to install Homebrew. You can do this following the instructions on their [website](https://brew.sh/). @@ -36,17 +36,17 @@ To update Git, run the following command. ``` ### Configure -You now managed to get Git up and running. Please proceed as described in the article [Configuring Git](/git/configuring-git) to set up your name and email address for Git. +Git is now up and running. Please proceed as described in the article [Configuring Git](/git/configuring-git) to set up your name and email address for Git. ## Windows 10 -There are several possibilities to install Git on Windows. An easy one is to use Git’s install wizard, shown here. +There are several ways to install Git on Windows. An easy one is to use Git’s install wizard, shown here. -### Admin or user? -For some Git clients (see [below](#git-clients)), e.g. [RStudio](https://rstudio.com/), it is recommended to install Git as administrator on your machine. It is also possible to install as regular user, but you might have to manually specify the path to the Git executable in the settings of your Git client. +### Permissions +For some Git clients (see [below](#git-clients)), e.g. [RStudio](https://rstudio.com/), it is recommended to install Git as administrator. It is also possible to install Git as a standard user, but you may have to manually specify the path to the Git executable in the settings of your Git client. ### Install -If you want to install as regular user, just log in with your user account and run the installer. -To install with administrator rights, either log in as administrator, or run the installer as administrator. In the latter case, right-click on the installer, select `Run as administrator` and enter your credentials: +If you want to install Git as a standard user, just log in with your user account and run the installer. +To install with administrator permissions, run the installer as administrator. Right-click on the installer, select `Run as administrator` and enter your credentials: @@ -54,11 +54,11 @@ To install with administrator rights, either log in as administrator, or run the -From there, follow the steps in the setup wizard. It is okay to just accept the defaults, when in doubt. -There are some steps for which you might have to pay attention: +From here, follow the steps in the setup wizard. It is okay to just accept the defaults, when in doubt. +Here are some important steps: -1. Choose your editor: -By default, [Vim](https://www.vim.org/) will be used for Git. But if you prefer to use another one, select it here. +1. Choose your editor:
+By default, [Vim](https://www.vim.org/) will be used for Git. If you prefer to use another editor, select it here. @@ -66,7 +66,7 @@ By default, [Vim](https://www.vim.org/) will be used for Git. But if you prefer 2. PATH environment: -This makes sure that Git can be used by 3rd party software ([Git clients](#git-clients)). It is recommended (and the default anyway). +This ensures that Git can be used by 3rd party software ([Git clients](#git-clients)). PATH adjustment is recommended (and the default). @@ -74,15 +74,15 @@ This makes sure that Git can be used by 3rd party software ([Git clients](#git-c 3. Choose credential helper: -From Git 2.29.0 onwards, the `Git Credential Manager Core` will be used by default. The `Git Credential Manager` can still be installed and used, but is now deprecated. When using either of these credential managers, your Git/Codeberg credentials will be stored in Windows' [Credential Manager](https://support.microsoft.com/en-us/help/4026814/windows-accessing-credential-manager) when you enter them for your first pull/push (see [Clone & Commit via HTTP](/git/clone-commit-via-http)). Windows' Credential Manager is also where you have to go in order to change them. Follow the links on the installation wizard for more details. -If you prefer not to store your credentials in Windows but e.g. in a password manager, select the third option (`None`). You will have to enter your credentials at every push/pull. +From Git 2.29.0 onwards, the `Git Credential Manager Core` will be used by default. The `Git Credential Manager` can still be installed and used, but is now deprecated. When using either of these, your Git/Codeberg credentials will be stored in Windows' [Credential Manager](https://support.microsoft.com/en-us/help/4026814/windows-accessing-credential-manager) when you enter them for your first pull/push (see [Clone & Commit via HTTP](/git/clone-commit-via-http)). Windows' Credential Manager is also where you'd go to change them. Follow the links on the setup wizard for more details. +If you'd prefer not to store your credentials in Windows but e.g. in a password manager, select the third option (`None`). You'll have to enter your credentials at every push/pull. win-cred-helper -> You may get the error message displayed below, that the release notes cannot be displayed. That error message can be safely ignored. You can find the release notes in `Start Menu > Git > Git Release Notes`. +> You may get the error message displayed below, saying that the release notes cannot be displayed. This can be safely ignored; you can find the release notes in `Start Menu → Git → Git Release Notes`. > > > @@ -90,12 +90,12 @@ If you prefer not to store your credentials in Windows but e.g. in a password ma > ### Run -Git can be used through the `Command Prompt` (the traditional Windows command line interpreter), the `Windows Powershell` (the "replacement" of the `Command Prompt`), the interface of your [Git client](#git-clients), or `Git Bash`. The latter two options are recommended. +Git can be used through `Command Prompt` (the traditional Windows command line interpreter), `PowerShell` (the "replacement" of Command Prompt), your [Git client](#git-clients), or `Git Bash`. The latter two options are recommended. -`Git Bash` is what comes with your Git installation. You can access it from the Start Menu: `Git > Git Bash`. +`Git Bash` is what comes with Git. You can access it from the Start Menu: `Git → Git Bash`. ### Configure -You now managed to get Git up and running. Please proceed as described in the article [Configuring Git](/git/configuring-git) to set up your name and email address for Git. +You have now managed to get Git up and running. Please proceed as described in the article [Configuring Git](/git/configuring-git) to set up your name and email address for Git. ### Update If you ticked the box to check for updates during installation, Git will inform you that a new version is available. @@ -103,13 +103,13 @@ To check for updates, at the command line, type: ```bash git update-git-for-windows ``` -Then, just follow the instructions of the terminal to download and install the latest version. +After that, just follow the instructions in the terminal to update to the latest version. -Alternatively, you can also download the installer from the Git website as explained above. -> Make sure that you run the new installer with the same rights (administrator or user) as for the original installation. If not, it will be installed twice and that will create a mess. +Alternatively, you can download the installer from the Git website as explained above. +> Make sure that you run the new installer with the same permissions (Administrator or standard user) as the original installation. If not, it will be installed twice and that will create a mess. -If you want to keep all your previous settings, simply tick the box `Only show new options` in the installation wizard (see screenshots above). +If you want to keep all your previous settings, simply tick the box `Only show new options` in the setup wizard (see screenshots above). ## Git clients Git can be used from the command line as shown above, but it can also be used through graphical user interfaces called *Git clients*. -You can find a list of some available Git clients on the [Git website](https://git-scm.com/downloads/guis). +You can find a list of various Git clients on the [Git website](https://git-scm.com/downloads/guis).