瀏覽代碼

Add “merge” and “upstream” entries for submodules.

pull/1/head
Sam Hocevar 4 年之前
父節點
當前提交
2ff9562bac
共有 1 個檔案被更改,包括 20 行新增5 行删除
  1. +20
    -5
      .gitmodules

+ 20
- 5
.gitmodules 查看文件

@@ -1,18 +1,33 @@
[submodule "pegtl"] [submodule "pegtl"]
path = include/lol/3rdparty/pegtl path = include/lol/3rdparty/pegtl
url = ../../lolengine/ext-pegtl.git url = https://github.com/lolengine/ext-pegtl
branch = lol branch = lol
update = merge
upstream = https://github.com/taocpp/PEGTL

[submodule "mingw-std-threads"] [submodule "mingw-std-threads"]
path = include/lol/3rdparty/mingw-std-threads path = include/lol/3rdparty/mingw-std-threads
url = ../../lolengine/ext-mingw-std-threads.git url = https://github.com/lolengine/ext-mingw-std-threads
branch = master branch = master
update = merge
upstream = https://github.com/meganz/mingw-std-threads

[submodule "step"] [submodule "step"]
path = include/lol/3rdparty/step path = include/lol/3rdparty/step
url = ../../lolengine/ext-step url = https://github.com/lolengine/ext-step
branch = lol
update = merge
upstream = https://github.com/storm-ptr/step

[submodule "portable-file-dialogs"] [submodule "portable-file-dialogs"]
path = include/lol/3rdparty/portable-file-dialogs path = include/lol/3rdparty/portable-file-dialogs
url = ../../samhocevar/portable-file-dialogs.git url = https://github.com/samhocevar/portable-file-dialogs
branch = master branch = master
update = merge

[submodule "cli11"] [submodule "cli11"]
path = include/lol/3rdparty/cli11 path = include/lol/3rdparty/cli11
url = ../../lolengine/ext-cli11.git url = https://github.com/lolengine/ext-cli11
branch = lol
update = merge
upstream = https://github.com/CLIUtils/CLI11

||||||
x
 
000:0
Loading…
取消
儲存