Merge branch 'prepare-merge'

This commit is contained in:
Lucas Hinderberger 2020-10-23 10:04:51 +02:00
commit f94bd91090
3 changed files with 23 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View file

@ -55,7 +55,7 @@ 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 two steps for which you have to pay attention:
There are some steps for which you might have to pay attention:
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.
@ -66,13 +66,21 @@ By default, [Vim](https://www.vim.org/) will be used for Git. But if you prefer
</picture>
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).
<picture>
<source srcset="/assets/images/getting-started/install-git/win-path.webp" type="image/webp">
<img src="/assets/images/getting-started/install-git/win-path.png" alt="win-path">
</picture>
This makes sure that Git can be used by 3rd party software (Git clients). It is recommended (and the default) anyway.
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.
<picture>
<source srcset="/assets/images/getting-started/install-git/win-cred-helper.webp" type="image/webp">
<img src="/assets/images/getting-started/install-git/win-cred-helper.png" alt="win-cred-helper">
</picture>
> 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`.
>
@ -81,20 +89,26 @@ This makes sure that Git can be used by 3rd party software (Git clients). It is
> <img src="/assets/images/getting-started/install-git/win-error-notes.PNG" alt="win-error">
> </picture>
### 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, or `Git Bash`. The latter two options are recommended.
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 Bash` is what comes with your Git installation. 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.
Note that the first time you push/pull (see [Clone & Commit via HTTP](/git/clone-commit-via-http)), Git will ask for your Codeberg credentials. If you did not change this setting during installation, these credentials will be saved by Windows in its [Credential Manager](https://support.microsoft.com/en-us/help/4026814/windows-accessing-credential-manager). This is also where you have to go in order to change them.
### Update
To update Git, the easiest way is to download and run the latest version of the installer and follow the previous steps. 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.
If you want to keep all your settings, simply tick the box `Only show new options` in the installation wizard (see screenshots above). Here, "new options" refer to the options that were not available in the previous version.
If you ticked the box to check for updates during installation, Git will inform you that a new version is available.
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.
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.
If you want to keep all your previous settings, simply tick the box `Only show new options` in the installation wizard (see screenshots above).
<a name="git-clients"></a>
## Git clients