ovyerus.com / dotfiles
Nix configurations for my personal machines (Linux & macOS)
fork atom

git: add `solve` alias for `jj resolve`

ovyerus.com 167a926c 6794fff3

verified
options
unified split
Changed files
+1
modules
programs
git.nix
+1
modules/programs/git.nix 
···

       
105

       
105

       
 

       
          n = ["new"];


     

       
106

       
106

       
 

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


     

       
107

       
107

       
 

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


     

       

       
108

       
+

       
          solve = ["resolve" "--tool" "mergiraf"];


     

       
108

       
109

       
 

       
        };


     

       
109

       
110

       
 

       



     

       
110

       
111

       
 

       
        merge-tools.mergiraf = {