Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
korbinian90 committed Jan 3, 2025
1 parent bc007a9 commit 5da12a7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions docs/development/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ We use the [Git](https://git-scm.com/) version control system for the developmen

We provide here instructions to interact with the SPM repository using the [GitHub Desktop](https://desktop.github.com/). This mainly concerns Windows developers -- we also mention the command line equivalents when relevant. For Linux users, [additional steps](https://www.fil.ion.ucl.ac.uk/spm/docs/development/ssh_authentication/) are required to enable SSH authentication.

## Git Installation
## Git Installation

First, please install the GitHub Desktop:

Expand All @@ -27,7 +27,6 @@ During installation, you can accept most defaults. There are three options to be
![line ending conversions](../assets/figures/git_windows_eol.png){ width="45%" }
![default behavior of `git pull`](../assets/figures/git_windows_rebase.png){ width="45%" }


## Git Configuration

### Username and commit email address
Expand Down Expand Up @@ -81,7 +80,7 @@ To apply this setting from GitHub Desktop, you need to open the command prompt b

### Git autostash

Pull with rebase will fail if you have unstaged changes. One way around this if you're not ready to commit your changes is to stash the changed before doing a pull (`git stash`) and then restore then (`git stash pop`) afterwards. This can be automated by using the `autostash` option of `git rebase`.
Pull with rebase will fail if you have unstaged changes. One way around this if you're not ready to commit your changes is to stash the changes before doing a pull (`git stash`) and then restore them (`git stash pop`) afterwards. This can be automated by using the `autostash` option of `git rebase`.

```
git config --global rebase.autoStash true
Expand Down

0 comments on commit 5da12a7

Please sign in to comment.