git revision helper
merge