Comparing 4afb47e881...8785247675 - nix-config-v2 - Miller SCM - Gitea

wymiller/nix-config-v2

Author	SHA1	Message	Date
Wyatt J. Miller	8785247675	added git merge backup settings	2025-06-12 13:01:59 -04:00

1 changed files with 1 additions and 0 deletions

									
										1

home/git.nix
									
												View File
												
					@@ -17,6 +17,7 @@

					      push.autoSetupRemote = true;

					      push.autoSetupRemote = true;

					      pull.merge = true;

					      pull.merge = true;

					      merge.tool = "nvimdiff";

					      merge.tool = "nvimdiff";

					      mergetool.keepBackup = false;

					    };

					    };

					    ignores = [

					    ignores = [