Merge branch 'fix-document-gitversion' into adopt
(Git) Add alias fot "git merge --ff-only".
Merge branch 'trial-git-merge-force-ff' into trial