KOZOS (10)
とりあえず 1st Step は完了したので、gitorious に push を。
状況確認。
$ git branch master * step1 $ git checkout master Switched to branch 'master' $ git branch * master step1 $ git merge step1 Updating 5bb6b1a..cbaae1c Fast-forward .gitignore | 4 ++ Makefile | 62 +++++++++++++++++++++++++++++++++++++++++ defines.h | 11 +++++++ ld.scr | 31 ++++++++++++++++++++ lib.c | 19 ++++++++++++ lib.h | 7 ++++ main.c | 15 ++++++++++ serial.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ serial.h | 8 +++++ startup.s | 10 ++++++ vector.c | 18 ++++++++++++ 11 files changed, 275 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 defines.h create mode 100644 ld.scr create mode 100644 lib.c create mode 100644 lib.h create mode 100644 main.c create mode 100644 serial.c create mode 100644 serial.h create mode 100644 startup.s create mode 100644 vector.c $
あー、--no-ff するの忘れたorz
$ git reset --hard HEAD~2 HEAD is now at 5bb6b1a add README $ git merge step1 --no-ff Merge made by recursive. .gitignore | 4 ++ Makefile | 62 +++++++++++++++++++++++++++++++++++++++++ defines.h | 11 +++++++ ld.scr | 31 ++++++++++++++++++++ lib.c | 19 ++++++++++++ lib.h | 7 ++++ main.c | 15 ++++++++++ serial.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ serial.h | 8 +++++ startup.s | 10 ++++++ vector.c | 18 ++++++++++++ 11 files changed, 275 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 defines.h create mode 100644 ld.scr create mode 100644 lib.c create mode 100644 lib.h create mode 100644 main.c create mode 100644 serial.c create mode 100644 serial.h create mode 100644 startup.s create mode 100644 vector.c $
これで log --graph が以下になりました。
* commit e1bc9a3091641b568fa6031623a852afc9847a54
|\ Merge: 5bb6b1a cbaae1c
| | Author: yamanetoshi <yamanetoshi@gmail.com>
| | Date: Thu Apr 14 18:35:16 2011 +0900
| |
| | Merge branch 'step1'
| |
| * commit cbaae1cf2e4ca8b7ce2686c09df4ad87f7640b96
| | Author: yamanetoshi <yamanetoshi@gmail.com>
| | Date: Wed Apr 13 16:48:13 2011 +0900
| |
| | add .gitignore
| |
| * commit 33891560c1b87bf4a89befc2a58afe8c791df4f1
|/ Author: yamanetoshi <yamanetoshi@gmail.com>
| Date: Mon Apr 11 22:27:23 2011 +0900
|
| 1st step
|
* commit 5bb6b1a02b64afd6cf330bf3ac1dcf3090c9ca4b
Author: Yamane Toshiaki <rms@rms-ThinkPad-Edge.(none)>
Date: Mon Apr 11 21:05:12 2011 +0900
add READMEで、これを push すれば良いのかな。
$ git push origin master Counting objects: 17, done. Delta compression using up to 4 threads. Compressing objects: 100% (15/15), done. Writing objects: 100% (16/16), 3.48 KiB, done. Total 16 (delta 3), reused 0 (delta 0) => Syncing Gitorious... [OK] To git@gitorious.org:kozos/kozos.git 5bb6b1a..e1bc9a3 master -> master $
とりあえず step1 な branch の push まで完了。
