git branch
  devel
  experimental
  gles2
* master
  perf
  renderplan
[eto@mac Kiosk]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
nothing to commit (working directory clean)
[eto@mac Kiosk]$ git pull
Already up-to-date.
[eto@mac Kiosk]$ git pull origin master
From git+ssh://github.com/AreaMobile-it/Kiosk
 * branch            master     -> FETCH_HEAD
Already up-to-date.
[eto@mac Kiosk]$ git fetch origin master
From git+ssh://github.com/AreaMobile-it/Kiosk
 * branch            master     -> FETCH_HEAD
[eto@mac Kiosk]$ git merge origin master
fatal: 'origin' does not point to a commit
[eto@mac Kiosk]$ git merge origin/master
Already up-to-date.
[eto@mac Kiosk]$