added pretty gitlog alias
merge i think