From 64e149b69750fdc6f150a18e39a3df1ba76ccc24 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 27 Oct 2016 13:07:36 +1300 Subject: Add traccar-web as a submodule --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitmodules (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..fecd50d3e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "traccar-web"] + path = traccar-web + url = git@github.com:tananaev/traccar-web.git -- cgit v1.2.3 From 677a365f27633fc3a055593236ff66e054bcf9a4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 27 Oct 2016 13:13:52 +1300 Subject: Use relative path for submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index fecd50d3e..cf5af0625 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "traccar-web"] path = traccar-web - url = git@github.com:tananaev/traccar-web.git + url = ../traccar-web.git -- cgit v1.2.3 From cca0a0d105ea6c97bccdfe06c248a4a8e53bb6d2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 27 Oct 2016 13:17:58 +1300 Subject: Explicitly use master branch --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index cf5af0625..3c5e3a5c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "traccar-web"] path = traccar-web url = ../traccar-web.git + branch = master -- cgit v1.2.3 From b0eac0c99ea3d8e7eb6e5d95d03629460be06927 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 27 Oct 2016 13:21:21 +1300 Subject: Don't specify branch --- .gitmodules | 1 - 1 file changed, 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3c5e3a5c7..cf5af0625 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "traccar-web"] path = traccar-web url = ../traccar-web.git - branch = master -- cgit v1.2.3 From 793af111fd2cb86c9a9a31a4ff58b1217d727a7e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 27 Oct 2016 19:19:42 +1300 Subject: Try to specify submodule branch again --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index cf5af0625..3c5e3a5c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "traccar-web"] path = traccar-web url = ../traccar-web.git + branch = master -- cgit v1.2.3 From 3868f6a5092019a480335af6eeabf8093d16dde2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 29 Oct 2016 12:20:29 +1300 Subject: Use same branch as main repo --- .gitmodules | 2 +- traccar-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3c5e3a5c7..0f1e76a12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "traccar-web"] path = traccar-web url = ../traccar-web.git - branch = master + branch = . diff --git a/traccar-web b/traccar-web index f6915ca3b..854476dcd 160000 --- a/traccar-web +++ b/traccar-web @@ -1 +1 @@ -Subproject commit f6915ca3bf4e8c2d9df5eb4cd5283614d4dd747e +Subproject commit 854476dcd9bb9b3b48d297cb7369cfe719c492f9 -- cgit v1.2.3 From 12ddac1b181692a1e32a1a26e9189ab3091dd4bc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 1 Nov 2016 14:47:27 +1300 Subject: Explicitly specify branch --- .gitmodules | 2 +- traccar-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 0f1e76a12..3c5e3a5c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "traccar-web"] path = traccar-web url = ../traccar-web.git - branch = . + branch = master diff --git a/traccar-web b/traccar-web index 854476dcd..a35f072d6 160000 --- a/traccar-web +++ b/traccar-web @@ -1 +1 @@ -Subproject commit 854476dcd9bb9b3b48d297cb7369cfe719c492f9 +Subproject commit a35f072d6a97f44910f9bf044096e291ffc38907 -- cgit v1.2.3 From e971b6c99bdfed266ea450b96dbc7564d820eda9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 3 Dec 2016 12:13:07 +1300 Subject: Ignore changes to submodule --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 3c5e3a5c7..5e245cc5b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,4 @@ path = traccar-web url = ../traccar-web.git branch = master + ignore = all -- cgit v1.2.3