Update README-git.md
This commit is contained in:
parent
0d0cf20a68
commit
9dffd62950
|
@ -9,34 +9,46 @@ First you need to fork 2 repos:
|
||||||
- ChibiOS-contrib
|
- ChibiOS-contrib
|
||||||
|
|
||||||
Make local clone of your fork
|
Make local clone of your fork
|
||||||
|
```bash
|
||||||
# git clone git@github.com:username/ChibiOS-gitmain.git
|
# git clone git@github.com:username/ChibiOS-gitmain.git
|
||||||
|
```
|
||||||
|
|
||||||
Make local branch for your feature
|
Make local branch for your feature
|
||||||
|
```bash
|
||||||
# cd ChibiOS-gitmain
|
# cd ChibiOS-gitmain
|
||||||
# git branch feature
|
# git branch feature
|
||||||
# git checkout feature
|
# git checkout feature
|
||||||
|
```
|
||||||
|
|
||||||
There is no code from ChibiOS-contrib in your repo. We have to connect
|
There is no code from ChibiOS-contrib in your repo. We have to connect
|
||||||
ChibiOS-contrib as a git submodule
|
ChibiOS-contrib as a git submodule
|
||||||
|
```bash
|
||||||
# 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
|
Make branch again, but now in freshly connected submodule
|
||||||
|
```bash
|
||||||
# cd community
|
# cd community
|
||||||
# git branch feature
|
# git branch feature
|
||||||
# git checkout feature
|
# git checkout feature
|
||||||
|
```
|
||||||
|
|
||||||
Hack, hack, hack... Commit our changes and push to server. Note: you have
|
Hack, hack, hack... Commit our changes and push to server. Note: you have
|
||||||
to do this for both repositories. First ChibiOS-Contrib
|
to do this for both repositories. First ChibiOS-Contrib
|
||||||
|
```bash
|
||||||
# cd community
|
# cd community
|
||||||
# git add .
|
# git add .
|
||||||
# git commit -m "Feature implemented"
|
# git commit -m "Feature implemented"
|
||||||
# git push origin feature:feature
|
# git push origin feature:feature
|
||||||
|
```
|
||||||
|
|
||||||
Now for parent repo
|
Now for parent repo
|
||||||
|
```bash
|
||||||
# cd ..
|
# cd ..
|
||||||
# git add .
|
# git add .
|
||||||
# git commit -m "Feature implemented"
|
# git commit -m "Feature implemented"
|
||||||
# git push origin feature:feature
|
# git push origin feature:feature
|
||||||
|
```
|
||||||
|
|
||||||
Now all your changes published on github. Just use web interface to send
|
Now all your changes published on github. Just use web interface to send
|
||||||
pull 2 requests: for ChibiOS-contrib and for ChibiOS-gitmain.
|
pull 2 requests: for ChibiOS-contrib and for ChibiOS-gitmain.
|
||||||
|
|
Loading…
Reference in New Issue