[user] name = Adam Cooper email = adam@theadamcooper.com [core] pager = delta attributesfile = ~/.gitattributes [interactive] diffFilter = delta --color-only [delta] features = side-by-side line-numbers decorations whitespace-error-style = 22 reverse [delta "decorations"] commit-decoration-style = bold yellow box ul file-style = bold yellow ul file-decoration-style = none [init] defaultBranch = main [merge "mergiraf"] name = mergiraf driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L