diff --git a/git/config b/git/config index 261f06b..bca3ac7 100644 --- a/git/config +++ b/git/config @@ -29,6 +29,9 @@ xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scen [init] defaultBranch = main +[log] +date = iso + [merge] conflictStyle = diff3 ff = only