ovyerus.com / dotfiles
this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Ashlynne Mitchell 167a926c 6794fff3

+1
+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 = {