use rebase w/ pull, add log-today alias