samw/home
1
Fork 0
mirror of https://github.com/wlcx/home.git synced 2025-12-08 19:43:46 +00:00
Code Issues Projects Releases Wiki Activity

git: add mergiraf

Browse Source
This commit is contained in:
Sam W 2025-12-05 16:12:58 +00:00
parent 84d4741d98
commit c4953a227a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
home/git.nix
View File

@ -47,6 +47,13 @@
branch.sort = "-committerdate"; branch.sort = "-committerdate";
push.default = "current"; push.default = "current";
init.defaultBranch = "main"; init.defaultBranch = "main";
merge = {
conflictStyle = "diff3";
mergiraf = {
name = "mergiraf";
driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
};
};
}; };
includes = [ includes = [
# Always include local gitconfig if it's there # Always include local gitconfig if it's there