aboutsummaryrefslogtreecommitdiffstats
path: root/README-git.txt
blob: 4e4a57f766d22010832183dde5c207e2580abdd1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Quick start:
============

Assume you already have a github account. Lets your account name is
"username".

First you need to fork 2 repos:
- ChibiOS-gitmain
- ChibiOS-contrib

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
# 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