From 0907deb9d9ca3cc2fb3613670f9aa3186490ab01 Mon Sep 17 00:00:00 2001 From: barthess Date: Sun, 19 Oct 2014 17:57:27 +0300 Subject: Updated README-git.txt --- README-git.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README-git.txt b/README-git.txt index f5830ae..da4d446 100644 --- a/README-git.txt +++ b/README-git.txt @@ -19,5 +19,7 @@ to ChibiOS-Contrib 3) send pull request as usual Links: +https://help.github.com/ +http://git-scm.com/ http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide -- cgit v1.2.3 From 6d51b2dc8385784eed75bbe659bddee1b00654fd Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Sun, 19 Oct 2014 20:31:18 +0300 Subject: Update README-git.txt --- README-git.txt | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/README-git.txt b/README-git.txt index da4d446..2aef0d7 100644 --- a/README-git.txt +++ b/README-git.txt @@ -1,25 +1,46 @@ 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: https://help.github.com/ http://git-scm.com/ http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide - -- cgit v1.2.3 From 09dc3fb5d0dfe188f78b6b52e2d55312c3c7174b Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Sun, 19 Oct 2014 20:35:29 +0300 Subject: Update README-git.txt --- README-git.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README-git.txt b/README-git.txt index 2aef0d7..608b122 100644 --- a/README-git.txt +++ b/README-git.txt @@ -1,4 +1,5 @@ Quick start: +============ Assume you already have a github account. Lets your account name is "username". @@ -11,9 +12,11 @@ Make local clone of your fork git clone git@github.com:username/ChibiOS-gitmain.git 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 -- cgit v1.2.3 From b35150ee1b9db9d55defe24bead502aad29519fe Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Sun, 19 Oct 2014 20:37:46 +0300 Subject: Update README-git.txt --- README-git.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README-git.txt b/README-git.txt index 608b122..39da296 100644 --- a/README-git.txt +++ b/README-git.txt @@ -12,11 +12,9 @@ Make local clone of your fork git clone git@github.com:username/ChibiOS-gitmain.git 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 @@ -44,6 +42,7 @@ 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 -- cgit v1.2.3 From 3c9ff8aace11aa20f3474191a27e3f2485ef35c6 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Sun, 19 Oct 2014 20:39:55 +0300 Subject: Update README-git.txt --- README-git.txt | 33 +++++++++++++++++---------------- 1 file 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 -- cgit v1.2.3