From b8891b5f084c92d447a96d8918006eecbe86510c Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Mon, 24 Aug 2015 16:40:20 +0300 Subject: [PATCH 1/5] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 924aba76..92d70fd4 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,11 @@ notes in file headers. Code is maintained via Github https://github.com/ChibiOS/ChibiOS-Contrib Feel free to send pull request there. + +#### Using + +```bash +# git clone git@github.com:Chibios/ChibiOS.git ChibiOS-RT +# git clone git@github.com:ChibiOS/ChibiOS-Contrib.git ChibiOS-Contrib +``` +Note: this repos clonned in the same directory side by side (not inside). From 491ad35ccc7453f18be27b1fb246c3024d524cc6 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Mon, 24 Aug 2015 16:41:54 +0300 Subject: [PATCH 2/5] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 92d70fd4..73346266 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,9 @@ Feel free to send pull request there. # git clone git@github.com:ChibiOS/ChibiOS-Contrib.git ChibiOS-Contrib ``` Note: this repos clonned in the same directory side by side (not inside). + +#### Useful links + +https://help.github.com/ +http://git-scm.com/ +http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide From 5e8611186e63f0b9304e807aa190b98392087d59 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Mon, 24 Aug 2015 16:42:07 +0300 Subject: [PATCH 3/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 73346266..32c7d896 100644 --- a/README.md +++ b/README.md @@ -18,5 +18,7 @@ Note: this repos clonned in the same directory side by side (not inside). #### Useful links https://help.github.com/ + http://git-scm.com/ + http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide From 0f58e799a2f03f377a4c49a38b4237e1993d8dd3 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Mon, 24 Aug 2015 16:43:27 +0300 Subject: [PATCH 4/5] Delete README-git.md This file now obsolete. --- README-git.md | 63 --------------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 README-git.md diff --git a/README-git.md b/README-git.md deleted file mode 100644 index 3cfc241b..00000000 --- a/README-git.md +++ /dev/null @@ -1,63 +0,0 @@ -Quick start: -============ - -Assume you already have a github account. Lets your account name is -"username". - -First you need to fork 2 repos: -- ChibiOS -- ChibiOS-contrib - -Make local clone of your fork -```bash -# git clone git@github.com:username/ChibiOS.git -``` - -Make local branch for your feature -```bash -# cd ChibiOS -# 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 -2 pull requests: for ChibiOS-contrib and for ChibiOS. - -Links: -====== - -https://help.github.com/ - -http://git-scm.com/ - -http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide From a123b4c1c661e6a43cb0f37a743193ddc7c81db6 Mon Sep 17 00:00:00 2001 From: Uladzimir Pylinski Date: Mon, 24 Aug 2015 16:55:58 +0300 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 32c7d896..913b1e74 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Feel free to send pull request there. # git clone git@github.com:Chibios/ChibiOS.git ChibiOS-RT # git clone git@github.com:ChibiOS/ChibiOS-Contrib.git ChibiOS-Contrib ``` -Note: this repos clonned in the same directory side by side (not inside). +Note: this repos cloned in the same directory side by side (not inside). #### Useful links