use pull --no-commit --ff
-- Git-author: Jocelyn FIAT <jfiat@...(none)> -- Git-id: cb63a7dfc78b98dbb3da584ad539444c62bd8036
Authored by: jocelyn_fiat 1970-01-01
Parent: [r21]
Child: [r23]