wymiller/nix-config-v2
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

add merge tool, change pull algo

Browse Source
This commit is contained in:
wymiller 2025-02-15 13:08:53 -05:00
parent 1d6331c6cc
commit cc7e26cecc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
home/git.nix
View File

@ -15,7 +15,8 @@
extraConfig = { extraConfig = {
init.defaultBranch = "master"; init.defaultBranch = "master";
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.rebase = true; pull.merge = true;
merge.tool = "nvimdiff";
}; };
ignores = [ ignores = [
@ -39,7 +40,7 @@
dc = "diff --cached"; dc = "diff --cached";
amend = "commit --amend -m"; amend = "commit --amend -m";
# aliases for submodule # aliases for submodules
update = "submodule update --init --recursive"; update = "submodule update --init --recursive";
foreach = "submodule foreach"; foreach = "submodule foreach";
}; };