diff --git a/gitconfig b/gitconfig index 995e781..e67724a 100644 --- a/gitconfig +++ b/gitconfig @@ -1,9 +1,14 @@ [user] name = Noel Weichbrodt email = noel@mailinator.com -[color] [color] ui = auto [alias] prettylog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative prettyfiles = log --graph --diff-filter[ACDMR] --name-status --pretty --source --abbrev-commit --format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %C(green(%cr) %C(bold blue)<%an>%Creset' +[core] + whitespace = trailing-space,space-before-tab +[diff] + renames = copies +[merge] + stat = true \ No newline at end of file