diff options
| author | barthess <barthess@yandex.ru> | 2014-11-16 13:52:04 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2014-11-16 13:52:04 +0300 |
| commit | 95a760ac77ca18e04cdfb65198c71c7fc19c29fa (patch) | |
| tree | 513ac65beecfeb16609b1d9cfa0104bcdf815437 | |
| parent | 42c6e0d7d6cc6ad0a98e9d19e911f6ea34578fe6 (diff) | |
| parent | 70465e063dd7493e6d6351316e4cd27928da5483 (diff) | |
| download | ChibiOS-Contrib-95a760ac77ca18e04cdfb65198c71c7fc19c29fa.tar.gz ChibiOS-Contrib-95a760ac77ca18e04cdfb65198c71c7fc19c29fa.tar.bz2 ChibiOS-Contrib-95a760ac77ca18e04cdfb65198c71c7fc19c29fa.zip | |
Merge branch 'master' of github.com:ChibiOS/ChibiOS-Contrib
| -rw-r--r-- | README-git.txt | 56 |
1 files changed, 41 insertions, 15 deletions
diff --git a/README-git.txt b/README-git.txt index f5830ae..4e4a57f 100644 --- a/README-git.txt +++ b/README-git.txt @@ -1,23 +1,49 @@ Quick start: +============ -1) git clone git@github.com:ChibiOS/ChibiOS-gitmain.git -2) cd ChibiOS-gitmain && \ - git submodule add git@github.com:ChibiOS/ChibiOS-Contrib.git community -Step #2 is optional if you not interested in community code. +Assume you already have a github account. Lets your account name is +"username". -Contributing: +First you need to fork 2 repos: +- ChibiOS-gitmain +- ChibiOS-contrib -to ChibiOS-gitmain -1) fork git repository at your own account -2) make fix and test it -3) submit patch here http://sourceforge.net/projects/chibios/ - or here http://forum.chibios.org +Make local clone of your fork +# git clone git@github.com:username/ChibiOS-gitmain.git -to ChibiOS-Contrib -1) fork git repository at your own account -2) develop feature -3) send pull request as usual +Make local branch for your feature +# cd ChibiOS-gitmain +# git branch feature +# git checkout feature + +There is no code from ChibiOS-contrib in your repo. We have to connect +ChibiOS-contrib as a git submodule +# git submodule add git@github.com:username/ChibiOS-Contrib.git community + +Make branch again, but now in freshly connected submodule +# cd community +# git branch feature +# git checkout feature + +Hack, hack, hack... Commit our changes and push to server. Note: you have +to do this for both repositories. First ChibiOS-Contrib +# cd community +# git add . +# git commit -m "Feature implemented" +# git push origin feature:feature + +Now for parent repo +# cd .. +# git add . +# git commit -m "Feature implemented" +# git push origin feature:feature + +Now all your changes published on github. Just use web interface to send +pull 2 requests: for ChibiOS-contrib and for ChibiOS-gitmain. Links: -http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide +====== +https://help.github.com/ +http://git-scm.com/ +http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide |