Android なプロトタイプ作って云々
まず Eclipse にてプロジェクト作成。
作成されたディレクトリにて以下。
$ cd Prototype-1.6 $ git init $ git add . $ git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: .classpath # new file: .project # new file: AndroidManifest.xml # new file: bin/Prototype-1.6.apk # new file: bin/classes.dex # new file: bin/jp/co/lexues/proto/ProtoActivity.class # new file: bin/jp/co/lexues/proto/R$attr.class # new file: bin/jp/co/lexues/proto/R$drawable.class # new file: bin/jp/co/lexues/proto/R$layout.class # new file: bin/jp/co/lexues/proto/R$string.class # new file: bin/jp/co/lexues/proto/R.class # new file: bin/resources.ap_ # new file: default.properties # new file: gen/jp/co/lexues/proto/R.java # new file: res/drawable-hdpi/icon.png # new file: res/drawable-ldpi/icon.png # new file: res/drawable-mdpi/icon.png # new file: res/layout/main.xml # new file: res/values/strings.xml # new file: src/jp/co/lexues/proto/ProtoActivity.java # $ git commit -m 'first commit' [master (root-commit) ebb54f7] first commit 20 files changed, 124 insertions(+), 0 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 AndroidManifest.xml create mode 100644 bin/Prototype-1.6.apk create mode 100644 bin/classes.dex create mode 100644 bin/jp/co/lexues/proto/ProtoActivity.class create mode 100644 bin/jp/co/lexues/proto/R$attr.class create mode 100644 bin/jp/co/lexues/proto/R$drawable.class create mode 100644 bin/jp/co/lexues/proto/R$layout.class create mode 100644 bin/jp/co/lexues/proto/R$string.class create mode 100644 bin/jp/co/lexues/proto/R.class create mode 100644 bin/resources.ap_ create mode 100644 default.properties create mode 100644 gen/jp/co/lexues/proto/R.java create mode 100644 res/drawable-hdpi/icon.png create mode 100644 res/drawable-ldpi/icon.png create mode 100644 res/drawable-mdpi/icon.png create mode 100644 res/layout/main.xml create mode 100644 res/values/strings.xml create mode 100644 src/jp/co/lexues/proto/ProtoActivity.java $ git remote add origin git@github.com:yamanetoshi/xx.git $ git push origin master Enter passphrase for key '/Users/tyamane/.ssh/id_rsa': Counting objects: 43, done. Delta compression using up to 2 threads. Compressing objects: 100% (25/25), done. Writing objects: 100% (43/43), 25.70 KiB, done. Total 43 (delta 3), reused 0 (delta 0) To git@github.com:yamanetoshi/xx.git * [new branch] master -> master $
これで登録完了のはず。次にブランチをナニ。
$ git checkout -b develop master Switched to a new branch 'develop' $ git push origin develop Enter passphrase for key '/Users/tyamane/.ssh/id_rsa': Total 0 (delta 0), reused 0 (delta 0) To git@github.com:yamanetoshi/xx.git * [new branch] develop -> develop $
で、.git/config 見てみたのですが、中身が以下。
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
url = git@github.com:yamanetoshi/xx.git
fetch = +refs/heads/*:refs/remotes/origin/*これは branch 切り替えても同様でした。一旦削除して clone してみるか。
$ git clone git@github.com:yamanetoshi/xx.git Prototype-1.6 Initialized empty Git repository in /Users/tyamane/tmp/Prototype-1.6/.git/ Enter passphrase for key '/Users/tyamane/.ssh/id_rsa': remote: Counting objects: 43, done. remote: Compressing objects: 100% (25/25), done. remote: Total 43 (delta 3), reused 0 (delta 0) Receiving objects: 100% (43/43), 25.70 KiB, done. Resolving deltas: 100% (3/3), done. $
で、.git/config の中身を見てみると以下。
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@github.com:yamanetoshi/xx.git
[branch "master"]
remote = origin
merge = refs/heads/masterふむふむ。branch をナニしてみるか。
$ git checkout -t -b develop origin/develop Branch develop set up to track remote branch develop from origin. Switched to a new branch 'develop' $ git branch * develop master $
む、できている。しかも .git/config は以下。
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@github.com:yamanetoshi/xx.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "develop"]
remote = origin
merge = refs/heads/develop凄いねぇ。とは言え現状ではどっちの branch も同じ状態ですが。
別途
merge とか push のあたりも色々試してみたいですが、とりあえず投入。
