リモートリポジトリの変更点をローカルに反映させる

git pullを行ったので記事を書いていく。

masterブランチの変更点をローカルに反映

macbookで作業した以下のコミットをiMacに反映させた。

APIからデータを取得して表示するためのTaskList.js · ki-hi-ro/react_todo@d3d4d3d

git pull origin masterで反映完了

hiroki@shibatahiroshitakanoiMac react_todo % git pull origin master
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
From https://github.com/ki-hi-ro/react_todo
 * branch            master     -> FETCH_HEAD
Updating 97e2b11..d3d4d3d
Fast-forward
 src/components/TaskList.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/components/TaskList.js