[short message]

[author]

[date] [commit id]