git: added git-up configuration
merge