Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentheirendt committed Jul 5, 2017
2 parents bb39267 + 857c846 commit 21a2724
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions PREREQUISITES.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ In order to install `git`, install the [Xcode Command Line Tools](http://osxdail

**Windows**

Please download the `git` tools for Windows from [here](https://git-scm.com/download). During the installation process, please ensure that you select **Use Git from the Windows Command Prompt**. In addition, please make sure that you select **Checkout as-is, commit Unix-style line endings**.
Please download the `git` tools for Windows from [here](https://git-scm.com/download/win). During the installation process, please ensure that you select **Use Git Bash and optional Unix tools from the Windows Command prompt**. In addition, please make sure that you select **Checkout as-is, commit Unix-style line endings**.

<div align="center">
<img src="assets/installation_git_windows_0.png" height="280px">&nbsp;&nbsp;&nbsp;<img src="assets/installation_git_windows_1.png" height="280px">.
<img src="https://cdn.rawgit.com/opencobra/cobratoolbox/develop/docs/source/_static/images/installation_git_windows_0.png" height="280px">&nbsp;&nbsp;&nbsp;<img src="https://cdn.rawgit.com/opencobra/cobratoolbox/develop/docs/source/_static/images/installation_git_windows_1.png" height="280px">.
</div>

## Github and local `git` configuration
Expand All @@ -75,4 +75,4 @@ On **Linux (Ubuntu)** or **macOS**, start the terminal (or any other shell). On
$ git config --global user.github-username "yourGitHubUsername"
$ git config --global user.email "first.last@server.com"
```
Please replace `"yourGitHubUsername"` and `"first.last@server.com"` with your respective credentials.
Please replace `"yourGitHubUsername"` and `"first.last@server.com"` with your respective credentials.
Binary file removed assets/installation_git_windows_0.png
Binary file not shown.
Binary file removed assets/installation_git_windows_1.png
Binary file not shown.

0 comments on commit 21a2724

Please sign in to comment.