diff options
| -rw-r--r-- | README-git.txt | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/README-git.txt b/README-git.txt index 39da296..4e4a57f 100644 --- a/README-git.txt +++ b/README-git.txt @@ -9,40 +9,41 @@ First you need to fork 2 repos: - ChibiOS-contrib 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 -cd ChibiOS-gitmain -git branch feature -git checkout 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 +# 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 +# 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 +# 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 +# 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: ====== + https://help.github.com/ http://git-scm.com/ http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide |