gistfile1.sh

git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'
[veleno@irmbp:Leads-infinispan]%git up
Fetching origin
remote: Counting objects: 5151, done.
remote: Compressing objects: 100% (2888/2888), done.
remote: Total 5151 (delta 1592), reused 3879 (delta 996)
Receiving objects: 100% (5151/5151), 2.04 MiB | 1.24 MiB/s, done.
Resolving deltas: 100% (1592/1592), done.
From https://github.com/otrack/Leads-infinispan
 * [new branch]      ensemble   -> origin/ensemble
   78f26e1..e75f69e  master     -> origin/master
   db1ef03..7453f55  versioning -> origin/versioning
 x [deleted]         (none)     -> origin/infinispan-ensemble
fatal: HEAD does not point to a branch