forkしたプロジェクトに、本家の更新を取り込む手順

　ぼちぼちgitを使いこなさないとやばそうなので、メモッとく
昔似たようなことを書いたようなｗ？

you fork mruby to github

   #+BEGIN_SRC bash
   $ git clone git@github.com:murasesyuka/mruby.git
   Cloning into 'mruby'...
   ..
   .

   $ cd mruby
   $ git branch -a
   * master
     remotes/origin/HEAD -> origin/master
     remotes/origin/master
   #+END_SRC

add remote repo, is give name to upstream

   #+BEGIN_SRC bash
   $ git remote add upstream git@github.com:mruby/mruby.git
   #+END_SRC

in detail add upsatream

    #+BEGIN_SRC bash
    $ g remote add upstream https://github.com/mruby/mruby
       
    $ g remote -v
    origin	git@github.com:murasesyuka/mruby.git (fetch)
    origin	git@github.com:murasesyuka/mruby.git (push)
    upstream	https://github.com/mruby/mruby (fetch)
    upstream	https://github.com/mruby/mruby (push)

    $ git remote rm upstream
    $ git remote -v
    origin	git@github.com:murasesyuka/mruby.git (fetch)
    origin	git@github.com:murasesyuka/mruby.git (push)

    $ git push origin master
    #+END_SRC

update master from upstream and push origin

　以下が取り込み手順。
最初はupstreamをfetchして、branchつくって、mergeする手順考えたけど、
remote updateして、masterにmerge --ffすれば良さそうに思うｗ＝*1

1st think method

    #+BEGIN_SRC bash
    $ git fetch upstream
    $ git brach up remotes/upstream/master
    $ git checkout master
    $ git rebase up
    $ git push
    #+END_SRC

it's refactoring method

    #+BEGIN_SRC bash
    $ git remote update
    $ git checkout master
    $ git merge --ff remotes/upstream/master
    $ git push
    #+END_SRC

*1:で、良いよね？