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

Update README-git.txt

This commit is contained in:
Uladzimir Pylinski 2014-10-19 20:39:55 +03:00
parent b35150ee1b
commit 3c9ff8aace
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
README-git.txt
View File

@ -9,40 +9,41 @@ First you need to fork 2 repos:
- ChibiOS-contrib - ChibiOS-contrib
Make local clone of your fork Make local clone of your fork
git clone git@github.com:username/ChibiOS-gitmain.git # git clone git@github.com:username/ChibiOS-gitmain.git
Make local branch for your feature Make local branch for your feature
cd ChibiOS-gitmain # cd ChibiOS-gitmain
git branch feature # git branch feature
git checkout feature # git checkout feature
There is no code from ChibiOS-contrib in your repo. We have to connect There is no code from ChibiOS-contrib in your repo. We have to connect
ChibiOS-contrib as a git submodule ChibiOS-contrib as a git submodule
git submodule add git@github.com:username/ChibiOS-Contrib.git community # git submodule add git@github.com:username/ChibiOS-Contrib.git community
Make branch again, but now in freshly connected submodule Make branch again, but now in freshly connected submodule
cd community # cd community
git branch feature # git branch feature
git checkout feature # git checkout feature
Hack, hack, hack... Commit our changes and push to server. Note: you have Hack, hack, hack... Commit our changes and push to server. Note: you have
to do this for both repositories. First ChibiOS-Contrib to do this for both repositories. First ChibiOS-Contrib
cd community # cd community
git add . # git add .
git commit -m "Feature implemented" # git commit -m "Feature implemented"
git push origin feature:feature # git push origin feature:feature
Now for parent repo Now for parent repo
cd .. # cd ..
git add . # git add .
git commit -m "Feature implemented" # git commit -m "Feature implemented"
git push origin feature:feature # git push origin feature:feature
Now all your changes published on github. Just use web interface to send Now all your changes published on github. Just use web interface to send
pull 2 requests: for ChibiOS-contrib and for ChibiOS-gitmain. pull 2 requests: for ChibiOS-contrib and for ChibiOS-gitmain.
Links: Links:
====== ======
https://help.github.com/ https://help.github.com/
http://git-scm.com/ http://git-scm.com/
http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide