adtya/configuration.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git: push to remote branch with same name

Browse source
This commit is contained in:
Adithya 2024-06-09 23:57:31 +05:30
parent dfd35efa58
commit e976a09257
Signed by: adtya
GPG key ID: B8857BFBA2C47B9C
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
home/programs/git.nix
View file

@ -29,7 +29,10 @@ in
fetch.prune = true; fetch.prune = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";
push.autoSetupRemote = true; push = {
default = "current";
autoSetupRemote = true;
};
pull.ff = "only"; pull.ff = "only";
}; };
ignores = [ "/.nix" "/.direnv" ]; ignores = [ "/.nix" "/.direnv" ];