git : mergeの設定が無いとき。 git branch –set-upstreamを使ってみる。
http://git-scm.com
pro git は , サイトやpdf epubで無料公開されています。
== 本題 ==
最初のcommit後にoriginにmasterをpush
$ git push origin master
Counting objects: 8, done.
Delta compression using up to 3 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (8/8), 2.89 KiB, done.
Total 8 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (8/8), done.
To remote.server:/mygit
* [new branch] master -> master
merge設定していないとgit pull したときに以下のメッセージが
use something like the following in your configuration file:
[branch "master"]
remote =
merge =
[remote "
url =
fetch =
手で書いたり、git configで適当に入れていたのですが
If specified branch does not exist yet or if –force has been given, acts exactly like –track. Otherwise sets up configuration
like –track would when creating the branch, except that where branch points to is not changed.
–set-upstreamを使ってみます。
start-pointを設定しないと
warning: Not setting branch master as its own upstream.
Branch master set up to track remote branch master from origin.
remoteに設定したoriginからブランチmaster を見るよとなりました。
=== メモ ===
$ git push origin master
j@0000’s password:
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (31/31), done.
Writing objects: 100% (32/32), 811.29 KiB, done.
Total 32 (delta 5), reused 0 (delta 0)
To 192.168.0.0:/home/git/chrome/useragent
* [new branch] master -> master
$ git branch –set-upstream master origin/master
Branch master set up to track remote branch master from origin.
$ git pull
Already up-to-date.
