>[info] git log ~~~ $ git log --graph --pretty=oneline --abbrev-commit * 7825a50 merge with no-ff |\ | * 6224937 add merge |/ * 59bc1cb conflict fixed ~~~ ~~~ $ log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short ~~~