71 lines
5.3 KiB
Diff
71 lines
5.3 KiB
Diff
|
diff -uwr Chibios.20_original/.git/FETCH_HEAD Chibios.20_rusefi/.git/FETCH_HEAD
|
||
|
|
--- Chibios.20_original/.git/FETCH_HEAD 2021-01-09 18:01:26.493993900 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/FETCH_HEAD 2021-01-09 18:01:26.904158400 -0500
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-d96c2af163e53c456bdd885c52056d20545b6dde branch 'stable_20.3.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
+d96c2af163e53c456bdd885c52056d20545b6dde branch 'stable_20.3.x.rusefi' of https://github.com/rusefi/ChibiOS
|
||
|
|
bbb700257e3e932f60e12e8a2c7dc2120cea3e26 not-for-merge branch 'master' of https://github.com/rusefi/ChibiOS
|
||
|
|
a4b2c113e74e026dfc7cc02060b32ab3f047ae8d not-for-merge branch 'revert-10-master' of https://github.com/rusefi/ChibiOS
|
||
|
|
e61ff3aa1c1fd0f1057e08ae4551abbc01595550 not-for-merge branch 'stable_1.0.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
@@ -14,7 +14,7 @@
|
||
|
|
c807840cdcec4e09b3fd0d2268370d9a317f0b90 not-for-merge branch 'stable_2.2.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
062803674562e117754c051992535d69a3762573 not-for-merge branch 'stable_2.4.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
0b0e793cc832373af431029878bc4b6f8c3e5fa5 not-for-merge branch 'stable_2.6.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
-d96c2af163e53c456bdd885c52056d20545b6dde not-for-merge branch 'stable_20.3.x.rusefi' of https://github.com/rusefi/ChibiOS
|
||
|
|
+d96c2af163e53c456bdd885c52056d20545b6dde not-for-merge branch 'stable_20.3.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
7596c99a218929e8c93341e2afa353134b64e233 not-for-merge branch 'stable_3.0.x' of https://github.com/rusefi/ChibiOS
|
||
|
|
93fdc45672692a73b3734b0e77f5978944477a2b not-for-merge branch 'stable_rusefi' of https://github.com/rusefi/ChibiOS
|
||
|
|
454717f06820c73845dac29dc95b72fbe7165704 not-for-merge branch 'trunk' of https://github.com/rusefi/ChibiOS
|
||
|
|
diff -uwr Chibios.20_original/.git/HEAD Chibios.20_rusefi/.git/HEAD
|
||
|
|
--- Chibios.20_original/.git/HEAD 2021-01-09 18:01:23.040248200 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/HEAD 2021-01-09 17:58:02.260312800 -0500
|
||
|
|
@@ -1 +1 @@
|
||
|
|
-ref: refs/heads/stable_20.3.x
|
||
|
|
+ref: refs/heads/stable_20.3.x.rusefi
|
||
|
|
diff -uwr Chibios.20_original/.git/config Chibios.20_rusefi/.git/config
|
||
|
|
--- Chibios.20_original/.git/config 2021-01-09 18:01:23.044248500 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/config 2021-01-09 17:58:02.264312400 -0500
|
||
|
|
@@ -8,6 +8,6 @@
|
||
|
|
[remote "origin"]
|
||
|
|
url = https://github.com/rusefi/ChibiOS
|
||
|
|
fetch = +refs/heads/*:refs/remotes/origin/*
|
||
|
|
-[branch "stable_20.3.x"]
|
||
|
|
+[branch "stable_20.3.x.rusefi"]
|
||
|
|
remote = origin
|
||
|
|
- merge = refs/heads/stable_20.3.x
|
||
|
|
+ merge = refs/heads/stable_20.3.x.rusefi
|
||
|
|
Binary files Chibios.20_original/.git/index and Chibios.20_rusefi/.git/index differ
|
||
|
|
diff -uwr Chibios.20_original/.git/logs/HEAD Chibios.20_rusefi/.git/logs/HEAD
|
||
|
|
--- Chibios.20_original/.git/logs/HEAD 2021-01-09 18:01:23.042248300 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/logs/HEAD 2021-01-09 17:58:02.262313800 -0500
|
||
|
|
@@ -1 +1 @@
|
||
|
|
-0000000000000000000000000000000000000000 d96c2af163e53c456bdd885c52056d20545b6dde rusefillc <sdfsdfqsf2334234234> 1610233283 -0500 clone: from https://github.com/rusefi/ChibiOS
|
||
|
|
+0000000000000000000000000000000000000000 d96c2af163e53c456bdd885c52056d20545b6dde rusefillc <sdfsdfqsf2334234234> 1610233082 -0500 clone: from https://github.com/rusefi/ChibiOS
|
||
|
|
Only in Chibios.20_original/.git/logs/refs/heads: stable_20.3.x
|
||
|
|
Only in Chibios.20_rusefi/.git/logs/refs/heads: stable_20.3.x.rusefi
|
||
|
|
diff -uwr Chibios.20_original/.git/logs/refs/remotes/origin/HEAD Chibios.20_rusefi/.git/logs/refs/remotes/origin/HEAD
|
||
|
|
--- Chibios.20_original/.git/logs/refs/remotes/origin/HEAD 2021-01-09 18:01:23.039248400 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/logs/refs/remotes/origin/HEAD 2021-01-09 17:58:02.259304600 -0500
|
||
|
|
@@ -1 +1 @@
|
||
|
|
-0000000000000000000000000000000000000000 bbb700257e3e932f60e12e8a2c7dc2120cea3e26 rusefillc <sdfsdfqsf2334234234> 1610233283 -0500 clone: from https://github.com/rusefi/ChibiOS
|
||
|
|
+0000000000000000000000000000000000000000 bbb700257e3e932f60e12e8a2c7dc2120cea3e26 rusefillc <sdfsdfqsf2334234234> 1610233082 -0500 clone: from https://github.com/rusefi/ChibiOS
|
||
|
|
Only in Chibios.20_rusefi/.git/logs/refs/remotes/origin: stable_20.3.x
|
||
|
|
Only in Chibios.20_original/.git/objects/pack: pack-668cff25d611c7199e7543d5cdd7c5662f4aa17b.idx
|
||
|
|
Only in Chibios.20_original/.git/objects/pack: pack-668cff25d611c7199e7543d5cdd7c5662f4aa17b.pack
|
||
|
|
Only in Chibios.20_rusefi/.git/objects/pack: pack-bbcef4de2c0001c4f9864417bebcfd4e562d8838.idx
|
||
|
|
Only in Chibios.20_rusefi/.git/objects/pack: pack-bbcef4de2c0001c4f9864417bebcfd4e562d8838.pack
|
||
|
|
diff -uwr Chibios.20_original/.git/packed-refs Chibios.20_rusefi/.git/packed-refs
|
||
|
|
--- Chibios.20_original/.git/packed-refs 2021-01-09 18:01:23.036248500 -0500
|
||
|
|
+++ Chibios.20_rusefi/.git/packed-refs 2021-01-09 17:58:02.255613700 -0500
|
||
|
|
@@ -14,7 +14,6 @@
|
||
|
|
c807840cdcec4e09b3fd0d2268370d9a317f0b90 refs/remotes/origin/stable_2.2.x
|
||
|
|
062803674562e117754c051992535d69a3762573 refs/remotes/origin/stable_2.4.x
|
||
|
|
0b0e793cc832373af431029878bc4b6f8c3e5fa5 refs/remotes/origin/stable_2.6.x
|
||
|
|
-d96c2af163e53c456bdd885c52056d20545b6dde refs/remotes/origin/stable_20.3.x
|
||
|
|
d96c2af163e53c456bdd885c52056d20545b6dde refs/remotes/origin/stable_20.3.x.rusefi
|
||
|
|
7596c99a218929e8c93341e2afa353134b64e233 refs/remotes/origin/stable_3.0.x
|
||
|
|
93fdc45672692a73b3734b0e77f5978944477a2b refs/remotes/origin/stable_rusefi
|
||
|
|
Only in Chibios.20_original/.git/refs/heads: stable_20.3.x
|
||
|
|
Only in Chibios.20_rusefi/.git/refs/heads: stable_20.3.x.rusefi
|
||
|
|
Only in Chibios.20_rusefi/.git/refs/remotes/origin: stable_20.3.x
|