git pull (strategy)

[ondrejsika]

root@git:~/example# git pull
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.
remote: Enumerating objects: 8, done.
remote: Counting objects: 100% (8/8), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (6/6), 1.25 KiB | 1.25 MiB/s, done.
From gitlab.sikademo.com:example/example
   0748810..f00f05f  master     -> origin/master
Updating 0748810..f00f05f
Fast-forward
 .gitignore | 12 ++++++++++++
 README.md  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 .gitignore