From d8818dcae9b4c7e4777a2701b1704a1229913f9f Mon Sep 17 00:00:00 2001 From: ledutu2 Date: Sun, 12 Nov 2023 23:23:14 +0700 Subject: [PATCH 1/2] squash commit together add module adsfl kjsdaklfj askdjf lasdklf add sub modules --- .gitmodules | 6 ++++++ git-two.ts | 2 +- lib/--force | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 lib/--force diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..726f0e3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "lib/git-submodule"] + path = lib/git-submodule + url = https://github.com/ledutu2/git-submodule.git +[submodule "lib/--force"] + path = lib/--force + url = https://github.com/ledutu2/git-submodule.git diff --git a/git-two.ts b/git-two.ts index 7e8516d..4b81489 100644 --- a/git-two.ts +++ b/git-two.ts @@ -1,5 +1,5 @@ const gitTwo = () => { - console.log('test git 2'); + console.log('test asdasd 2'); }; gitTwo(); diff --git a/lib/--force b/lib/--force new file mode 160000 index 0000000..4ad90e8 --- /dev/null +++ b/lib/--force @@ -0,0 +1 @@ +Subproject commit 4ad90e80c2aad3f2f9b5c9e45ee299755cb0299e From 6dea4f133981d8d9a73c0b392d306e43bc1a01f1 Mon Sep 17 00:00:00 2001 From: ledutu2 Date: Tue, 14 Nov 2023 14:24:59 +0700 Subject: [PATCH 2/2] feature/ledutu: feature/ledutu: sadfjdsakl fjdsa --- git-ledutu.ts | 1 + git-two.ts | 2 +- test.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 git-ledutu.ts create mode 100644 test.txt diff --git a/git-ledutu.ts b/git-ledutu.ts new file mode 100644 index 0000000..3fb3705 --- /dev/null +++ b/git-ledutu.ts @@ -0,0 +1 @@ +console.log('LEDUTU') \ No newline at end of file diff --git a/git-two.ts b/git-two.ts index 4b81489..f4193dd 100644 --- a/git-two.ts +++ b/git-two.ts @@ -1,5 +1,5 @@ const gitTwo = () => { - console.log('test asdasd 2'); + console.log('test asdasd 123123 123 123 12 2'); }; gitTwo(); diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..74a5116 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +fjsdaklfjlksadjl fsdajk fjsadlkj flksadjlfk jasdlkjf lasjkf jasdklf \ No newline at end of file