Skip to content

Commit 0e9c673

Browse files
committed
Update README.md
1 parent 3224930 commit 0e9c673

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ Make Unity Projects work better with Git.
44

55
Currently for Windows only.
66

7-
<!-- add screenshot.png -->
8-
97
<!-- ![Screenshot](Public/carbon.png) -->
108
![Screenshot](Public/ScreenshotAlt.png)
119

12-
## What it does
10+
## What they do
11+
12+
- Add `unityyamlmerge` mergetool added to `.git/config`, to be used with `.gitattributes`
13+
- Add [mergerules](mergerules.txt) to make `unityyamlmerge` ignore negligible differences. [(Source)](https://docs.unity3d.com/Manual/SmartMerge.html)
14+
- Make `git pull` uses rebase (for cleaner history when pulling from origin)
15+
- Make submodules also get fetched when you execute `git pull/fetch`
1316

14-
- `unityyamlmerge` mergetool added to `.git/config`, to be used with `.gitattributes`
15-
- Unity scene merges work better, with [mergerules](mergerules.txt) that ignore negligible differences.
16-
- `git pull` now uses rebase (cleaner history when pulling from master)
17-
- Submodules get automatically fetched when you `git pull/fetch`
17+
(Details can be found in each `.ps1` scripts, you may also modify them to your liking.)
1818

1919
## Installation
2020

@@ -24,7 +24,7 @@ Or clone the repository:
2424
```powershell
2525
cd $UnityProjectRoot
2626
git clone https://www.github.com/Maoyeedy/UnityProjectSetupScripts.git .setup
27-
rm -r -fo SetupScripts/.git
27+
rm -r -fo .setup/.git
2828
```
2929

3030
Or add as submodule:

0 commit comments

Comments
 (0)