@@ -22,6 +22,9 @@ extraConfig = {       init = {
         defaultBranch = "main";
       };
+      apply = {
+        whitespace = "fix";
+      };
       advice = {
         addEmptyPathspec = false;
         detachedHead = false;
@@ -33,12 +36,15 @@ user = "alanpearce";       };
       core = {
         commitGraph = true;
+        autocrlf = "input";
+        safecrlf = true;
       };
       commit = {
         verbose = true;
       };
       pull = {
         rebase = true;
+        ff = "only";
       };
       fetch = {
         prune = true;
@@ -64,9 +70,13 @@ };       diff = {
         algorithm = "histogram";
         colorMoved = "plain";
+        colorMovedWS = "allow-indentation-change";
         mnemonicPrefix = true;
         renames = true;
       };
+      format = {
+        pretty = "fuller";
+      };
       grep = {
         patternType = "perl";
       };
@@ -75,6 +85,9 @@ autoSetupMerge = true;       };
       branch = {
         sort = "committerdate";
+      };
+      log = {
+        date = "iso-local";
       };
       tag = {
         sort = "version:refname";