immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update data, gtest and add options to .gitmodules 

Update the `data` and `lib/googletest` submodules.

`git submodule update --remote` command should now
update the data submodule by rebasing on the remote branch named
the same as the current branch.

Changes in the `lib/googletest` submodule should now be ignored
in `git status`.
fix-squashed-planets
MrSimbax 2021-12-08 19:15:16 +01:00
parent 9fd935770a
commit 38b9b9be4c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,9 @@
[submodule "data"]
path = data
url = git://github.com/colobot/colobot-data.git
branch = .
update = rebase
[submodule "lib/googletest"]
path = lib/googletest
url = git://github.com/google/googletest.git
ignore = all

2
data

@ -1 +1 @@
Subproject commit 21a45c0b8809accd142a83a81f1a3c92a327f319
Subproject commit 5d658744641064e56cf489453dbf726964b2b98d

2
lib/googletest

@ -1 +1 @@
Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e
Subproject commit e2239ee6043f73722e7aa812a459f54a28552929