andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#463 & docs

This commit is contained in:
rusefi 2018-01-23 13:59:20 -05:00
parent 80df4a5a01
commit cc55abb3be
4 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/docs/.gitignore vendored
View File

@ -1,2 +1,4 @@
Chibios.16_original
Chibios.16_rusefi
Chibios.17_original
Chibios.17_rusefi

52
firmware/docs/chibios_rusefi_17.patch Normal file
View File

@ -0,0 +1,52 @@
diff -uwr Chibios.17_original/.git/FETCH_HEAD Chibios.17_rusefi/.git/FETCH_HEAD
--- Chibios.17_original/.git/FETCH_HEAD 2018-01-23 13:35:28.466478000 -0500
+++ Chibios.17_rusefi/.git/FETCH_HEAD 2018-01-23 13:36:20.103431400 -0500
@@ -1,11 +1,11 @@
-c71ef710730191f767d077bc660142b1c8984915 branch 'stable_17.6.x' of https://github.com/rusefi/ChibiOS
+c71ef710730191f767d077bc660142b1c8984915 branch 'stable_17.6.rusefi' of https://github.com/rusefi/ChibiOS
b263680b98fbb41e939ce62e55916254ece4acc7 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
3957b74f871e2ac11b8447aa067b1cece4861970 not-for-merge branch 'stable_1.2.x' of https://github.com/rusefi/ChibiOS
06c45ae2ef94ff95bbdab317bc53aebe7c51aacc not-for-merge branch 'stable_1.4.x' of https://github.com/rusefi/ChibiOS
c8198eb36c2174484141f0119f720bcf0468a0b9 not-for-merge branch 'stable_16.1.x' of https://github.com/rusefi/ChibiOS
-c71ef710730191f767d077bc660142b1c8984915 not-for-merge branch 'stable_17.6.rusefi' of https://github.com/rusefi/ChibiOS
+c71ef710730191f767d077bc660142b1c8984915 not-for-merge branch 'stable_17.6.x' of https://github.com/rusefi/ChibiOS
e324eb668a8399c5e5342d3111d175f42f14b50b not-for-merge branch 'stable_2.0.x' of https://github.com/rusefi/ChibiOS
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
diff -uwr Chibios.17_original/.git/HEAD Chibios.17_rusefi/.git/HEAD
--- Chibios.17_original/.git/HEAD 2018-01-23 13:35:05.866185300 -0500
+++ Chibios.17_rusefi/.git/HEAD 2018-01-23 13:36:11.715951700 -0500
@@ -1 +1 @@
-ref: refs/heads/stable_17.6.x
+ref: refs/heads/stable_17.6.rusefi
diff -uwr Chibios.17_original/.git/config Chibios.17_rusefi/.git/config
--- Chibios.17_original/.git/config 2018-01-23 13:35:05.874185700 -0500
+++ Chibios.17_rusefi/.git/config 2018-01-23 13:36:11.730952500 -0500
@@ -8,6 +8,6 @@
[remote "origin"]
url = https://github.com/rusefi/ChibiOS
fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "stable_17.6.x"]
+[branch "stable_17.6.rusefi"]
remote = origin
- merge = refs/heads/stable_17.6.x
+ merge = refs/heads/stable_17.6.rusefi
Binary files Chibios.17_original/.git/index and Chibios.17_rusefi/.git/index differ
diff -uwr Chibios.17_original/.git/logs/HEAD Chibios.17_rusefi/.git/logs/HEAD
--- Chibios.17_original/.git/logs/HEAD 2018-01-23 13:35:05.872185600 -0500
+++ Chibios.17_rusefi/.git/logs/HEAD 2018-01-23 13:36:11.721952000 -0500
@@ -1 +1 @@
-0000000000000000000000000000000000000000 c71ef710730191f767d077bc660142b1c8984915 rusefi <arro239+rusefi@gmail.com> 1516732505 -0500 clone: from https://github.com/rusefi/ChibiOS
+0000000000000000000000000000000000000000 c71ef710730191f767d077bc660142b1c8984915 rusefi <arro239+rusefi@gmail.com> 1516732571 -0500 clone: from https://github.com/rusefi/ChibiOS
Only in Chibios.17_rusefi/.git/logs/refs/heads: stable_17.6.rusefi
Only in Chibios.17_original/.git/logs/refs/heads: stable_17.6.x
diff -uwr Chibios.17_original/.git/logs/refs/remotes/origin/HEAD Chibios.17_rusefi/.git/logs/refs/remotes/origin/HEAD
--- Chibios.17_original/.git/logs/refs/remotes/origin/HEAD 2018-01-23 13:35:05.864185200 -0500
+++ Chibios.17_rusefi/.git/logs/refs/remotes/origin/HEAD 2018-01-23 13:36:11.712951500 -0500
@@ -1 +1 @@
-0000000000000000000000000000000000000000 b263680b98fbb41e939ce62e55916254ece4acc7 rusefi <arro239+rusefi@gmail.com> 1516732505 -0500 clone: from https://github.com/rusefi/ChibiOS
+0000000000000000000000000000000000000000 b263680b98fbb41e939ce62e55916254ece4acc7 rusefi <arro239+rusefi@gmail.com> 1516732571 -0500 clone: from https://github.com/rusefi/ChibiOS
Only in Chibios.17_rusefi/.git/refs/heads: stable_17.6.rusefi
Only in Chibios.17_original/.git/refs/heads: stable_17.6.x

14
firmware/docs/prepare_diff.bat
View File

@ -1,3 +1,9 @@
#
# see also ../../misc/git_cheat_sheet.txt
# both 'rusefi/ChibiOS/original' and 'rusefi/ChibiOS/rusefi' should have upstream branch changes merged at the same time
#
# comparing against rusEfi version of the unmodified in order to compare remote branches on the same timestamp
#
git clone -b stable_16.1.x https://github.com/rusefi/ChibiOS Chibios.16_original
git -C Chibios.16_original pull
@ -6,3 +12,11 @@ git -C Chibios.16_rusefi pull
diff -uwr Chibios.16_rusefi Chibios.16_original > rusefi_chibios_16.patch
diff -uwr Chibios.16_original Chibios.16_rusefi > chibios_rusefi_16.patch
git clone -b stable_17.6.x https://github.com/rusefi/ChibiOS Chibios.17_original
git -C Chibios.17_original pull
git clone -b stable_17.6.rusefi https://github.com/rusefi/ChibiOS Chibios.17_rusefi
git -C Chibios.17_rusefi pull
diff -uwr Chibios.17_original Chibios.17_rusefi > chibios_rusefi_17.patch

3
misc/git_cheat_sheet.txt
View File

@ -38,6 +38,9 @@ git remote -v
=========================================
https://help.github.com/articles/syncing-a-fork/
git fetch upstream
git merge upstream/stable_17.6.x
git push
http://stackoverflow.com/questions/9646167/clean-up-a-fork-and-restart-it-from-the-upstream