commit a84b2ddf8fb0cf26467f67703628cdb02ea80133 · ovyerus.com/dotfiles

+13
modules/programs/git.nix
···

       44
       44
        
                 ff = "only";

     

       45
       45
        
                 # Really only useful on a well-managed team. Maybe eventually.

     

       46
       46
        
                 # verifySignatures = true;

     

       47
       47
       +
                 conflictStyle = "diff3";

     

       47
       48
        
               };

     

       48
       49
        
       

     

       49
       50
        
               push = {

     
···

       87
       88
        
               ui = {

     

       88
       89
        
                 default-command = "log";

     

       89
       90
        
                 show-cryptographic-signatures = true;

     

       91
       91
       +
                 conflict-marker-style = "git";

     

       92
       92
       +
                 diff-formatter = "delta";

     

       90
       93
        
               };

     

       91
       94
        
       

     

       92
       95
        
               revset-aliases = {

     

       93
       96
        
                 "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       97
       97
       +
                 "p(n)" = "p(@, n)";

     

       98
       98
       +
                 "p(r, n)" = "roots(r | ancestors(r-, n))";

     

       94
       99
        
               };

     

       95
       100
        
       

     

       96
       101
        
               aliases = {

     

       97
       102
        
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       98
       103
        
                 e = ["edit"];

     

       104
       104
       +
                 n = ["new"];

     

       105
       105
       +
               };

     

       106
       106
       +
       

     

       107
       107
       +
               merge-tools.mergiraf = {

     

       108
       108
       +
                 program = "mergiraf";

     

       109
       109
       +
                 merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];

     

       99
       110
        
               };

     

       100
       111
        
       

     

       101
       112
        
               git = {

     
···

       111
       122
        
               };

     

       112
       123
        
             };

     

       113
       124
        
           };

     

       125
       125
       +
       

     

       126
       126
       +
           programs.mergiraf.enable = true;

     

       114
       127
        
         };

     

       115
       128
        
       }