File tree 1 file changed +8
-8
lines changed
1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -4,17 +4,17 @@ Make Unity Projects work better with Git.
4
4
5
5
Currently for Windows only.
6
6
7
- <!-- add screenshot.png -->
8
-
9
7
<!--  -->
10
8
![ Screenshot] ( Public/ScreenshotAlt.png )
11
9
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 `
13
16
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.)
18
18
19
19
## Installation
20
20
@@ -24,7 +24,7 @@ Or clone the repository:
24
24
``` powershell
25
25
cd $UnityProjectRoot
26
26
git clone https://www.github.com/Maoyeedy/UnityProjectSetupScripts.git .setup
27
- rm -r -fo SetupScripts /.git
27
+ rm -r -fo .setup /.git
28
28
```
29
29
30
30
Or add as submodule:
You can’t perform that action at this time.
0 commit comments