Skip to content

Commit b3fdeaf

Browse files
committed
simplified git guidelines
1 parent 21b3292 commit b3fdeaf

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

docs/development/git.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,6 @@ During installation, you can accept most defaults. There are three options to be
2727
![line ending conversions](../assets/figures/git_windows_eol.png){ width="45%" }
2828
![default behavior of `git pull`](../assets/figures/git_windows_rebase.png){ width="45%" }
2929

30-
If you do not have the administrative permissions to install Git as described above, try and install [64-bit Git for Windows Portable](https://git-scm.com/download/win) to `C:\wtcnapps\` and add the directory containing `git.exe` to the `Path` environment variable for your account.
31-
32-
<!--
33-
TortoiseGit is another graphical interface for Git on Windows:
34-
35-
* [TortoiseGit](https://tortoisegit.org/)
36-
-->
37-
38-
<!--
39-
40-
It is also recommended to install the Visual Studio Code text editor and WinMerge:
41-
42-
* [Visual Studio Code](https://code.visualstudio.com/)
43-
* [WinMerge](https://winmerge.org/)
44-
45-
### Visual Studio Code Extensions
46-
47-
Visual Studio Code has a native support of Git:
48-
49-
* [Git Support in Visual Studio Code](https://code.visualstudio.com/docs/editor/versioncontrol#_git-support)
50-
51-
but some extra extensions are worth considering for MATLAB development:
52-
53-
* [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker)
54-
* [MATLAB](https://marketplace.visualstudio.com/items?itemName=Gimly81.matlab)
55-
* [Remote - SSH](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
56-
57-
-->
5830

5931
## Git Configuration
6032

@@ -115,8 +87,6 @@ Pull with rebase will fail if you have unstaged changes. One way around this if
11587
git config --global rebase.autoStash true
11688
```
11789

118-
This is equivalent to using `git fetch` followed by `git rebase --autostash` (or `git stash`, `git pull`, `git stash pop`).
119-
12090
As before, to apply this setting from GitHub Desktop, you need to open the command prompt by selecting ++"Repository"++ then ++"Open in Command Prompt"++ from the top menu and enter the above command line.
12191

12292
## Clone the SPM repository

0 commit comments

Comments
 (0)