repo git: Add more debug lines for rebasing
config: Keep logs for a week
event log: Fix crash when using default avatar. Closes #1331
repo git: add more debug info for resolving conflicts