From 9dffd62950415d2e4614019953a61808cc20a120 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Sat, 17 Jan 2015 16:07:26 +0300 Subject: [PATCH] Update README-git.md --- README-git.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README-git.md b/README-git.md index 4e4a57f7..ec4c8b66 100644 --- a/README-git.md +++ b/README-git.md @@ -9,34 +9,46 @@ First you need to fork 2 repos: - ChibiOS-contrib Make local clone of your fork +```bash # git clone git@github.com:username/ChibiOS-gitmain.git +``` Make local branch for your feature +```bash # 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 +```bash # git submodule add git@github.com:username/ChibiOS-Contrib.git community +``` Make branch again, but now in freshly connected submodule +```bash # 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 +```bash # cd community # git add . # git commit -m "Feature implemented" # git push origin feature:feature +``` Now for parent repo +```bash # 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.